summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-06-18 17:00:39 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-06-18 17:00:55 +0200
commit4d673b3cdb6d27d430087758a8081e4a10267595 (patch)
tree71639248c3b0b94795e7012df6b657008b7ae909
parent6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672 (diff)
downloadastra-4d673b3cdb6d27d430087758a8081e4a10267595.tar.gz
astra-4d673b3cdb6d27d430087758a8081e4a10267595.tar.bz2
astra-4d673b3cdb6d27d430087758a8081e4a10267595.tar.xz
astra-4d673b3cdb6d27d430087758a8081e4a10267595.zip
Fix composite EMode enum order in experimental.pyx
-rw-r--r--include/astra/CompositeGeometryManager.h2
-rw-r--r--python/astra/experimental.pyx4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h
index bb57277..c07c981 100644
--- a/include/astra/CompositeGeometryManager.h
+++ b/include/astra/CompositeGeometryManager.h
@@ -141,7 +141,7 @@ public:
JOB_FP, JOB_BP, JOB_FDK, JOB_NOP
} eType;
enum EMode {
- MODE_ADD, MODE_SET
+ MODE_ADD = 0, MODE_SET = 1
} eMode;
};
diff --git a/python/astra/experimental.pyx b/python/astra/experimental.pyx
index b1e3567..8f8e47d 100644
--- a/python/astra/experimental.pyx
+++ b/python/astra/experimental.pyx
@@ -36,8 +36,8 @@ IF HAVE_CUDA==True:
cdef extern from "astra/CompositeGeometryManager.h" namespace "astra::CCompositeGeometryManager::SJob":
cdef enum EMode:
- MODE_SET = 0
- MODE_ADD = 1
+ MODE_ADD = 0
+ MODE_SET = 1
cdef extern from "astra/CompositeGeometryManager.h" namespace "astra":
cdef cppclass CCompositeGeometryManager:
bool doFP(CProjector3D *, vector[CFloat32VolumeData3D *], vector[CFloat32ProjectionData3D *], EMode)