diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
| commit | 985057bb58bdb85a31fd883f2651fce9fb3fad16 (patch) | |
| tree | 69ad722aa934307adcd8cc9834d6437961b3215a /include/astra | |
| parent | a527cc9e29cae256bd095b032f34c80957e84907 (diff) | |
| parent | 231a6de483e94507de34bd2f79317d875bbb354b (diff) | |
| download | astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.gz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.bz2 astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.xz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'include/astra')
| -rw-r--r-- | include/astra/CompositeGeometryManager.h | 18 | ||||
| -rw-r--r-- | include/astra/Globals.h | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h index 08eb7af..35d1da2 100644 --- a/include/astra/CompositeGeometryManager.h +++ b/include/astra/CompositeGeometryManager.h @@ -140,7 +140,7 @@ public: enum { JOB_FP, JOB_BP, JOB_FDK, JOB_NOP } eType; - enum { + enum EMode { MODE_ADD, MODE_SET } eMode; @@ -154,22 +154,24 @@ public: SJob createJobFP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData, - CFloat32ProjectionData3D *pProjData); + CFloat32ProjectionData3D *pProjData, + SJob::EMode eMode); SJob createJobBP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData, - CFloat32ProjectionData3D *pProjData); + CFloat32ProjectionData3D *pProjData, + SJob::EMode eMode); // Convenience functions for creating and running a single FP or BP job bool doFP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData, - CFloat32ProjectionData3D *pProjData); + CFloat32ProjectionData3D *pProjData, SJob::EMode eMode = SJob::MODE_SET); bool doBP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData, - CFloat32ProjectionData3D *pProjData); + CFloat32ProjectionData3D *pProjData, SJob::EMode eMode = SJob::MODE_SET); bool doFDK(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData, CFloat32ProjectionData3D *pProjData, bool bShortScan, - const float *pfFilter = 0); + const float *pfFilter = 0, SJob::EMode eMode = SJob::MODE_SET); - bool doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData); - bool doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData); + bool doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData, SJob::EMode eMode = SJob::MODE_SET); + bool doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData, SJob::EMode eMode = SJob::MODE_SET); void setGPUIndices(const std::vector<int>& GPUIndices); diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 2ae1f78..8d0d619 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -58,9 +58,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. // macro's #define ASTRA_TOOLBOXVERSION_MAJOR 1 -#define ASTRA_TOOLBOXVERSION_MINOR 8 +#define ASTRA_TOOLBOXVERSION_MINOR 9 #define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR)) -#define ASTRA_TOOLBOXVERSION_STRING "1.8.3" +#define ASTRA_TOOLBOXVERSION_STRING "1.9.0dev" #define ASTRA_ASSERT(a) assert(a) |