From 845b398d9e2e078d7cb2a1da84fadceca66306a2 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 3 Oct 2017 14:52:24 +0200
Subject: Add experimental accumulate_FP/BP/FDK python functions
---
src/CompositeGeometryManager.cpp | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
(limited to 'src/CompositeGeometryManager.cpp')
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp
index 184144c..470476e 100644
--- a/src/CompositeGeometryManager.cpp
+++ b/src/CompositeGeometryManager.cpp
@@ -1115,7 +1115,8 @@ CCompositeGeometryManager::CProjectionPart* CCompositeGeometryManager::CProjecti
CCompositeGeometryManager::SJob CCompositeGeometryManager::createJobFP(CProjector3D *pProjector,
CFloat32VolumeData3D *pVolData,
- CFloat32ProjectionData3D *pProjData)
+ CFloat32ProjectionData3D *pProjData,
+ SJob::EMode eMode)
{
ASTRA_DEBUG("CCompositeGeometryManager::createJobFP");
// Create single job for FP
@@ -1141,14 +1142,15 @@ CCompositeGeometryManager::SJob CCompositeGeometryManager::createJobFP(CProjecto
FP.pOutput = boost::shared_ptr<CPart>(output);
FP.pProjector = pProjector;
FP.eType = SJob::JOB_FP;
- FP.eMode = SJob::MODE_SET;
+ FP.eMode = eMode;
return FP;
}
CCompositeGeometryManager::SJob CCompositeGeometryManager::createJobBP(CProjector3D *pProjector,
CFloat32VolumeData3D *pVolData,
- CFloat32ProjectionData3D *pProjData)
+ CFloat32ProjectionData3D *pProjData,
+ SJob::EMode eMode)
{
ASTRA_DEBUG("CCompositeGeometryManager::createJobBP");
// Create single job for BP
@@ -1172,25 +1174,25 @@ CCompositeGeometryManager::SJob CCompositeGeometryManager::createJobBP(CProjecto
BP.pOutput = boost::shared_ptr<CPart>(output);
BP.pProjector = pProjector;
BP.eType = SJob::JOB_BP;
- BP.eMode = SJob::MODE_SET;
+ BP.eMode = eMode;
return BP;
}
bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData,
- CFloat32ProjectionData3D *pProjData)
+ CFloat32ProjectionData3D *pProjData, SJob::EMode eMode)
{
TJobList L;
- L.push_back(createJobFP(pProjector, pVolData, pProjData));
+ L.push_back(createJobFP(pProjector, pVolData, pProjData, eMode));
return doJobs(L);
}
-bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData,
- CFloat32ProjectionData3D *pProjData)
+ bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData,
+ CFloat32ProjectionData3D *pProjData, SJob::EMode eMode)
{
TJobList L;
- L.push_back(createJobBP(pProjector, pVolData, pProjData));
+ L.push_back(createJobBP(pProjector, pVolData, pProjData, eMode));
return doJobs(L);
}
@@ -1198,14 +1200,14 @@ bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, CFloat32VolumeDat
bool CCompositeGeometryManager::doFDK(CProjector3D *pProjector, CFloat32VolumeData3D *pVolData,
CFloat32ProjectionData3D *pProjData, bool bShortScan,
- const float *pfFilter)
+ const float *pfFilter, SJob::EMode eMode)
{
if (!dynamic_cast<CConeProjectionGeometry3D*>(pProjData->getGeometry())) {
ASTRA_ERROR("CCompositeGeometryManager::doFDK: cone geometry required");
return false;
}
- SJob job = createJobBP(pProjector, pVolData, pProjData);
+ SJob job = createJobBP(pProjector, pVolData, pProjData, eMode);
job.eType = SJob::JOB_FDK;
job.FDKSettings.bShortScan = bShortScan;
job.FDKSettings.pfFilter = pfFilter;
@@ -1216,7 +1218,7 @@ bool CCompositeGeometryManager::doFDK(CProjector3D *pProjector, CFloat32VolumeDa
return doJobs(L);
}
-bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData)
+bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData, SJob::EMode eMode)
{
ASTRA_DEBUG("CCompositeGeometryManager::doFP, multi-volume");
@@ -1254,7 +1256,7 @@ bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, const std::vector
for (i2 = outputs.begin(); i2 != outputs.end(); ++i2) {
SJob FP;
- FP.eMode = SJob::MODE_SET;
+ FP.eMode = eMode;
for (j2 = inputs.begin(); j2 != inputs.end(); ++j2) {
FP.pInput = *j2;
FP.pOutput = *i2;
@@ -1262,7 +1264,7 @@ bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, const std::vector
FP.eType = SJob::JOB_FP;
L.push_back(FP);
- // Set first, add rest
+ // Always ADD rest
FP.eMode = SJob::MODE_ADD;
}
}
@@ -1270,7 +1272,7 @@ bool CCompositeGeometryManager::doFP(CProjector3D *pProjector, const std::vector
return doJobs(L);
}
-bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData)
+bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3D *>& volData, const std::vector<CFloat32ProjectionData3D *>& projData, SJob::EMode eMode)
{
ASTRA_DEBUG("CCompositeGeometryManager::doBP, multi-volume");
@@ -1309,7 +1311,7 @@ bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, const std::vector
for (i2 = outputs.begin(); i2 != outputs.end(); ++i2) {
SJob BP;
- BP.eMode = SJob::MODE_SET;
+ BP.eMode = eMode;
for (j2 = inputs.begin(); j2 != inputs.end(); ++j2) {
BP.pInput = *j2;
BP.pOutput = *i2;
@@ -1317,7 +1319,7 @@ bool CCompositeGeometryManager::doBP(CProjector3D *pProjector, const std::vector
BP.eType = SJob::JOB_BP;
L.push_back(BP);
- // Set first, add rest
+ // Always ADD rest
BP.eMode = SJob::MODE_ADD;
}
}
--
cgit v1.2.3
From 85b619e6c5c04faa6a365c5be4b9bc8c7db445fa Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 22 Nov 2017 17:02:25 +0100
Subject: Allow cone_vec for FDK
NB: This will let you do mathematically nonsensical things, since FDK
does not support non-circular cone geometries. However, this does let you
use translated detectors, for example.
---
src/CompositeGeometryManager.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src/CompositeGeometryManager.cpp')
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp
index 470476e..8af430c 100644
--- a/src/CompositeGeometryManager.cpp
+++ b/src/CompositeGeometryManager.cpp
@@ -1202,8 +1202,9 @@ bool CCompositeGeometryManager::doFDK(CProjector3D *pProjector, CFloat32VolumeDa
CFloat32ProjectionData3D *pProjData, bool bShortScan,
const float *pfFilter, SJob::EMode eMode)
{
- if (!dynamic_cast<CConeProjectionGeometry3D*>(pProjData->getGeometry())) {
- ASTRA_ERROR("CCompositeGeometryManager::doFDK: cone geometry required");
+ if (!dynamic_cast<CConeProjectionGeometry3D*>(pProjData->getGeometry()) &&
+ !dynamic_cast<CConeVecProjectionGeometry3D*>(pProjData->getGeometry())) {
+ ASTRA_ERROR("CCompositeGeometryManager::doFDK: cone/cone_vec geometry required");
return false;
}
--
cgit v1.2.3