diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-13 17:38:20 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-13 17:38:20 +0200 |
| commit | 4a12901ad7b08021b2adad1241bf750aec4a3d2d (patch) | |
| tree | 0dbb2480a325995422492a9488cdc4e5ffca47e9 /include/astra/CompositeGeometryManager.h | |
| parent | 399422985fd27a1e6a1f8cea3642402128b050fa (diff) | |
| parent | c599eac7c9576a74707a3fa9b3c02cff05b09760 (diff) | |
| download | astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.gz astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.bz2 astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.tar.xz astra-4a12901ad7b08021b2adad1241bf750aec4a3d2d.zip | |
Merge branch 'master' into fdk_custom_filter
Diffstat (limited to 'include/astra/CompositeGeometryManager.h')
| -rw-r--r-- | include/astra/CompositeGeometryManager.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h index 18dd72f..d30ffd1 100644 --- a/include/astra/CompositeGeometryManager.h +++ b/include/astra/CompositeGeometryManager.h @@ -55,6 +55,11 @@ struct SGPUParams { size_t memory; }; +struct SFDKSettings { + bool bShortScan; + const float *pfFilter; +}; + class _AstraExport CCompositeGeometryManager { public: @@ -127,9 +132,10 @@ public: CProjector3D *pProjector; // For a `global' geometry. It will not match // the geometries of the input and output. + SFDKSettings FDKSettings; enum { - JOB_FP, JOB_BP, JOB_NOP + JOB_FP, JOB_BP, JOB_FDK, JOB_NOP } eType; enum { MODE_ADD, MODE_SET @@ -155,6 +161,9 @@ public: CFloat32ProjectionData3DMemory *pProjData); bool doBP(CProjector3D *pProjector, CFloat32VolumeData3DMemory *pVolData, CFloat32ProjectionData3DMemory *pProjData); + bool doFDK(CProjector3D *pProjector, CFloat32VolumeData3DMemory *pVolData, + CFloat32ProjectionData3DMemory *pProjData, bool bShortScan, + const float *pfFilter = 0); bool doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3DMemory *>& volData, const std::vector<CFloat32ProjectionData3DMemory *>& projData); bool doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3DMemory *>& volData, const std::vector<CFloat32ProjectionData3DMemory *>& projData); |