Update version to 1.3

1 files changed, 314 insertions, 0 deletions

diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp
new file mode 100644
index 0000000..07569a2
--- /dev/null
+++ b/src/CudaCglsAlgorithm3D.cpp
@@ -0,0 +1,314 @@
+/*
+-----------------------------------------------------------------------
+Copyright 2012 iMinds-Vision Lab, University of Antwerp
+
+Contact: astra@ua.ac.be
+Website: http://astra.ua.ac.be
+
+
+This file is part of the
+All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox").
+
+The ASTRA Toolbox is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The ASTRA Toolbox is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
+
+-----------------------------------------------------------------------
+$Id$
+*/
+
+#include "astra/CudaCglsAlgorithm3D.h"
+
+#include <boost/lexical_cast.hpp>
+
+#include "astra/AstraObjectManager.h"
+
+#include "astra/ConeProjectionGeometry3D.h"
+#include "astra/ParallelVecProjectionGeometry3D.h"
+#include "astra/ConeVecProjectionGeometry3D.h"
+
+#include "../cuda/3d/astra3d.h"
+
+using namespace std;
+
+namespace astra {
+
+// type of the algorithm, needed to register with CAlgorithmFactory
+std::string CCudaCglsAlgorithm3D::type = "CGLS3D_CUDA";
+
+//----------------------------------------------------------------------------------------
+// Constructor
+CCudaCglsAlgorithm3D::CCudaCglsAlgorithm3D() 
+{
+	m_bIsInitialized = false;
+	m_pCgls = 0;
+	m_iGPUIndex = 0;
+	m_iVoxelSuperSampling = 1;
+	m_iDetectorSuperSampling = 1;
+}
+
+//----------------------------------------------------------------------------------------
+// Constructor with initialization
+CCudaCglsAlgorithm3D::CCudaCglsAlgorithm3D(CProjector3D* _pProjector, 
+								   CFloat32ProjectionData3DMemory* _pProjectionData, 
+								   CFloat32VolumeData3DMemory* _pReconstruction)
+{
+	_clear();
+	initialize(_pProjector, _pProjectionData, _pReconstruction);
+}
+
+//----------------------------------------------------------------------------------------
+// Destructor
+CCudaCglsAlgorithm3D::~CCudaCglsAlgorithm3D() 
+{
+	delete m_pCgls;
+	m_pCgls = 0;
+
+	CReconstructionAlgorithm3D::_clear();
+}
+
+
+//---------------------------------------------------------------------------------------
+// Check
+bool CCudaCglsAlgorithm3D::_check()
+{
+	// check base class
+	ASTRA_CONFIG_CHECK(CReconstructionAlgorithm3D::_check(), "CGLS3D", "Error in ReconstructionAlgorithm3D initialization");
+
+
+	return true;
+}
+
+//---------------------------------------------------------------------------------------
+// Initialize - Config
+bool CCudaCglsAlgorithm3D::initialize(const Config& _cfg)
+{
+	ASTRA_ASSERT(_cfg.self);
+	ConfigStackCheck<CAlgorithm> CC("CudaCglsAlgorithm3D", this, _cfg);
+
+
+	// if already initialized, clear first
+	if (m_bIsInitialized) {
+		clear();
+	}
+
+	// initialization of parent class
+	if (!CReconstructionAlgorithm3D::initialize(_cfg)) {
+		return false;
+	}
+
+	m_iGPUIndex = (int)_cfg.self->getOptionNumerical("GPUindex", 0);
+	CC.markOptionParsed("GPUindex");
+	m_iDetectorSuperSampling = (int)_cfg.self->getOptionNumerical("DetectorSuperSampling", 1);
+	CC.markOptionParsed("DetectorSuperSampling");
+	m_iVoxelSuperSampling = (int)_cfg.self->getOptionNumerical("VoxelSuperSampling", 1);
+	CC.markOptionParsed("VoxelSuperSampling");
+
+	m_pCgls = new AstraCGLS3d();
+
+	m_bAstraCGLSInit = false;
+
+
+	// success
+	m_bIsInitialized = _check();
+	return m_bIsInitialized;
+}
+
+//----------------------------------------------------------------------------------------
+// Initialize - C++
+bool CCudaCglsAlgorithm3D::initialize(CProjector3D* _pProjector, 
+								  CFloat32ProjectionData3DMemory* _pSinogram, 
+								  CFloat32VolumeData3DMemory* _pReconstruction)
+{
+	// if already initialized, clear first
+	if (m_bIsInitialized) {
+		clear();
+	}
+
+	// required classes
+	m_pProjector = _pProjector;
+	m_pSinogram = _pSinogram;
+	m_pReconstruction = _pReconstruction;
+
+	m_pCgls = new AstraCGLS3d;
+
+	m_bAstraCGLSInit = false;
+
+	// success
+	m_bIsInitialized = _check();
+	return m_bIsInitialized;
+}
+
+//---------------------------------------------------------------------------------------
+// Information - All
+map<string,boost::any> CCudaCglsAlgorithm3D::getInformation() 
+{
+	map<string, boost::any> res;
+	return mergeMap<string,boost::any>(CAlgorithm::getInformation(), res);
+};
+
+//---------------------------------------------------------------------------------------
+// Information - Specific
+boost::any CCudaCglsAlgorithm3D::getInformation(std::string _sIdentifier) 
+{
+	return CAlgorithm::getInformation(_sIdentifier);
+};
+
+//----------------------------------------------------------------------------------------
+// Iterate
+void CCudaCglsAlgorithm3D::run(int _iNrIterations)
+{
+	// check initialized
+	ASTRA_ASSERT(m_bIsInitialized);
+
+	const CProjectionGeometry3D* projgeom = m_pSinogram->getGeometry();
+	const CConeProjectionGeometry3D* conegeom = dynamic_cast<const CConeProjectionGeometry3D*>(projgeom);
+	const CParallelVecProjectionGeometry3D* parvec3dgeom = dynamic_cast<const CParallelVecProjectionGeometry3D*>(projgeom);
+	const CConeVecProjectionGeometry3D* conevec3dgeom = dynamic_cast<const CConeVecProjectionGeometry3D*>(projgeom);
+	const CVolumeGeometry3D& volgeom = *m_pReconstruction->getGeometry();
+
+	bool ok = true;
+
+	if (!m_bAstraCGLSInit) {
+
+		ok &= m_pCgls->setGPUIndex(m_iGPUIndex);
+
+		ok &= m_pCgls->setReconstructionGeometry(volgeom.getGridColCount(),
+		                                         volgeom.getGridRowCount(),
+		                                         volgeom.getGridSliceCount());
+/*
+                                  unsigned int iProjAngles,
+                                  unsigned int iProjU,
+                                  unsigned int iProjV,
+                                  float fOriginSourceDistance,
+                                  float fOriginDetectorDistance,
+                                  float fDetUSize,
+                                  float fDetVSize,
+                                  const float *pfAngles)
+*/
+		fprintf(stderr, "01: %d\n", ok);
+
+		if (conegeom) {
+			ok &= m_pCgls->setConeGeometry(conegeom->getProjectionCount(),
+			                               conegeom->getDetectorColCount(),
+			                               conegeom->getDetectorRowCount(),
+			                               conegeom->getOriginSourceDistance(),
+			                               conegeom->getOriginDetectorDistance(),
+			                               conegeom->getDetectorSpacingX(),
+			                               conegeom->getDetectorSpacingY(),
+			                               conegeom->getProjectionAngles());
+		} else if (parvec3dgeom) {
+			ok &= m_pCgls->setPar3DGeometry(parvec3dgeom->getProjectionCount(),
+			                                parvec3dgeom->getDetectorColCount(),
+			                                parvec3dgeom->getDetectorRowCount(),
+			                                parvec3dgeom->getProjectionVectors());
+		} else if (conevec3dgeom) {
+			ok &= m_pCgls->setConeGeometry(conevec3dgeom->getProjectionCount(),
+			                               conevec3dgeom->getDetectorColCount(),
+			                               conevec3dgeom->getDetectorRowCount(),
+			                               conevec3dgeom->getProjectionVectors());
+		} else {
+			ASTRA_ASSERT(false);
+		}
+		fprintf(stderr, "02: %d\n", ok);
+
+		ok &= m_pCgls->enableSuperSampling(m_iVoxelSuperSampling, m_iDetectorSuperSampling);
+
+		if (m_bUseReconstructionMask)
+			ok &= m_pCgls->enableVolumeMask();
+#if 0
+		if (m_bUseSinogramMask)
+			ok &= m_pCgls->enableSinogramMask();
+#endif
+
+		ASTRA_ASSERT(ok);
+		fprintf(stderr, "03: %d\n", ok);
+
+		ok &= m_pCgls->init();
+		fprintf(stderr, "04: %d\n", ok);
+
+		ASTRA_ASSERT(ok);
+
+		m_bAstraCGLSInit = true;
+
+	}
+
+	CFloat32ProjectionData3DMemory* pSinoMem = dynamic_cast<CFloat32ProjectionData3DMemory*>(m_pSinogram);
+	ASTRA_ASSERT(pSinoMem);
+
+	ok = m_pCgls->setSinogram(pSinoMem->getDataConst(), m_pSinogram->getGeometry()->getDetectorColCount());
+
+	fprintf(stderr, "1: %d\n", ok);
+	ASTRA_ASSERT(ok);
+
+	if (m_bUseReconstructionMask) {
+		CFloat32VolumeData3DMemory* pRMaskMem = dynamic_cast<CFloat32VolumeData3DMemory*>(m_pReconstructionMask);
+		ASTRA_ASSERT(pRMaskMem);
+		ok &= m_pCgls->setVolumeMask(pRMaskMem->getDataConst(), volgeom.getGridColCount());
+	}
+#if 0
+	if (m_bUseSinogramMask) {
+		CFloat32ProjectionData3DMemory* pSMaskMem = dynamic_cast<CFloat32ProjectionData3DMemory*>(m_pSinogramMask);
+		ASTRA_ASSERT(pSMaskMem);
+		ok &= m_pCgls->setSinogramMask(pSMaskMem->getDataConst(), m_pSinogramMask->getGeometry()->getDetectorColCount());
+	}
+#endif
+	fprintf(stderr, "2: %d\n", ok);
+
+	CFloat32VolumeData3DMemory* pReconMem = dynamic_cast<CFloat32VolumeData3DMemory*>(m_pReconstruction);
+	ASTRA_ASSERT(pReconMem);
+	ok &= m_pCgls->setStartReconstruction(pReconMem->getDataConst(),
+	                                      volgeom.getGridColCount());
+
+	ASTRA_ASSERT(ok);
+	fprintf(stderr, "3: %d\n", ok);
+
+#if 0
+	if (m_bUseMinConstraint)
+		ok &= m_pCgls->setMinConstraint(m_fMinValue);
+	if (m_bUseMaxConstraint)
+		ok &= m_pCgls->setMaxConstraint(m_fMaxValue);
+#endif
+	fprintf(stderr, "4: %d\n", ok);
+
+	ok &= m_pCgls->iterate(_iNrIterations);
+	ASTRA_ASSERT(ok);
+	fprintf(stderr, "5: %d\n", ok);
+
+	ok &= m_pCgls->getReconstruction(pReconMem->getData(),
+	                                 volgeom.getGridColCount());
+	fprintf(stderr, "6: %d\n", ok);
+	ASTRA_ASSERT(ok);
+
+
+}
+//----------------------------------------------------------------------------------------
+void CCudaCglsAlgorithm3D::signalAbort()
+{
+	if (m_bIsInitialized && m_pCgls) {
+		m_pCgls->signalAbort();
+	}
+}
+
+bool CCudaCglsAlgorithm3D::getResidualNorm(float32& _fNorm)
+{
+	if (!m_bIsInitialized || !m_pCgls)
+		return false;
+
+	_fNorm = m_pCgls->computeDiffNorm();
+
+	return true;
+}
+
+
+
+} // namespace astra