diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
| commit | 9101748879d81e8aafe7c77ecc4c8b2175390335 (patch) | |
| tree | e5c05f226b45d4fb910dda5fab74ff760d9e27a0 /src/CompositeGeometryManager.cpp | |
| parent | eeffd2d9748b8912b384a5764b808f5bfc850ade (diff) | |
| parent | 4a12901ad7b08021b2adad1241bf750aec4a3d2d (diff) | |
| download | astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.gz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.bz2 astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.xz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.zip | |
Merge branch 'fdk_custom_filter'
Diffstat (limited to 'src/CompositeGeometryManager.cpp')
| -rw-r--r-- | src/CompositeGeometryManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index 7c4f8e6..5879aec 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -1042,7 +1042,8 @@ bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, CFloat32VolumeDat bool CCompositeGeometryManager::doFDK(CProjector3D *pProjector, CFloat32VolumeData3DMemory *pVolData, - CFloat32ProjectionData3DMemory *pProjData, bool bShortScan) + CFloat32ProjectionData3DMemory *pProjData, bool bShortScan, + const float *pfFilter) { if (!dynamic_cast<CConeProjectionGeometry3D*>(pProjData->getGeometry())) { ASTRA_ERROR("CCompositeGeometryManager::doFDK: cone geometry required"); @@ -1052,6 +1053,7 @@ bool CCompositeGeometryManager::doFDK(CProjector3D *pProjector, CFloat32VolumeDa SJob job = createJobBP(pProjector, pVolData, pProjData); job.eType = SJob::JOB_FDK; job.FDKSettings.bShortScan = bShortScan; + job.FDKSettings.pfFilter = pfFilter; TJobList L; L.push_back(job); @@ -1288,7 +1290,7 @@ static bool doJob(const CCompositeGeometryManager::TJobSet::const_iterator& iter } else { ASTRA_DEBUG("CCompositeGeometryManager::doJobs: doing FDK"); - ok = astraCUDA3d::FDK(((CCompositeGeometryManager::CProjectionPart*)j.pInput.get())->pGeom, inputMem, ((CCompositeGeometryManager::CVolumePart*)j.pOutput.get())->pGeom, outputMem, j.FDKSettings.bShortScan); + ok = astraCUDA3d::FDK(((CCompositeGeometryManager::CProjectionPart*)j.pInput.get())->pGeom, inputMem, ((CCompositeGeometryManager::CVolumePart*)j.pOutput.get())->pGeom, outputMem, j.FDKSettings.bShortScan, j.FDKSettings.pfFilter); if (!ok) ASTRA_ERROR("Error performing sub-FDK"); ASTRA_DEBUG("CCompositeGeometryManager::doJobs: FDK done"); } |