Update version to 1.3

1 files changed, 154 insertions, 0 deletions

diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp
new file mode 100644
index 0000000..a2a30eb
--- /dev/null
+++ b/src/CudaSirtAlgorithm.cpp
@@ -0,0 +1,154 @@
+/*
+-----------------------------------------------------------------------
+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$
+*/
+
+#ifdef ASTRA_CUDA
+
+#include "astra/CudaSirtAlgorithm.h"
+
+#include <boost/lexical_cast.hpp>
+#include "astra/AstraObjectManager.h"
+
+#include "../cuda/2d/sirt.h"
+
+using namespace std;
+
+namespace astra {
+
+// type of the algorithm, needed to register with CAlgorithmFactory
+std::string CCudaSirtAlgorithm::type = "SIRT_CUDA";
+
+//----------------------------------------------------------------------------------------
+// Constructor
+CCudaSirtAlgorithm::CCudaSirtAlgorithm() 
+{
+	m_bIsInitialized = false;
+	CCudaReconstructionAlgorithm2D::_clear();
+
+	m_pMinMask = 0;
+	m_pMaxMask = 0;
+}
+
+//----------------------------------------------------------------------------------------
+// Destructor
+CCudaSirtAlgorithm::~CCudaSirtAlgorithm() 
+{
+	// The actual work is done by ~CCudaReconstructionAlgorithm2D
+
+	m_pMinMask = 0;
+	m_pMaxMask = 0;
+}
+
+//---------------------------------------------------------------------------------------
+// Initialize - Config
+bool CCudaSirtAlgorithm::initialize(const Config& _cfg)
+{
+	ASTRA_ASSERT(_cfg.self);
+	ConfigStackCheck<CAlgorithm> CC("CudaSirtAlgorithm", this, _cfg);
+
+	m_bIsInitialized = CCudaReconstructionAlgorithm2D::initialize(_cfg);
+
+	if (!m_bIsInitialized)
+		return false;
+
+	// min/max masks
+	if (_cfg.self->hasOption("MinMaskId")) {
+		int id = boost::lexical_cast<int>(_cfg.self->getOption("MinMaskId"));
+		m_pMinMask = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id));
+	}
+	CC.markOptionParsed("MinMaskId");
+	if (_cfg.self->hasOption("MaxMaskId")) {
+		int id = boost::lexical_cast<int>(_cfg.self->getOption("MaxMaskId"));
+		m_pMaxMask = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id));
+	}
+	CC.markOptionParsed("MaxMaskId");
+
+
+	m_pAlgo = new astraCUDA::SIRT();
+	m_bAlgoInit = false;
+
+	return true;
+}
+
+//---------------------------------------------------------------------------------------
+// Initialize - C++
+bool CCudaSirtAlgorithm::initialize(CProjector2D* _pProjector,
+                                     CFloat32ProjectionData2D* _pSinogram, 
+                                     CFloat32VolumeData2D* _pReconstruction,
+                                     int _iGPUindex, int _iDetectorSuperSampling,
+                                     int _iPixelSuperSampling)
+{
+	m_bIsInitialized = CCudaReconstructionAlgorithm2D::initialize(_pProjector, _pSinogram, _pReconstruction, _iGPUindex, _iDetectorSuperSampling, _iPixelSuperSampling);
+
+	if (!m_bIsInitialized)
+		return false;
+
+	
+
+	m_pAlgo = new astraCUDA::SIRT();
+	m_bAlgoInit = false;
+
+	return true;
+}
+
+//----------------------------------------------------------------------------------------
+// Iterate
+void CCudaSirtAlgorithm::run(int _iNrIterations)
+{
+	// check initialized
+	ASTRA_ASSERT(m_bIsInitialized);
+
+	if (!m_bAlgoInit) {
+		// We only override the initialisation step to copy the min/max masks
+
+		bool ok = setupGeometry();
+		ASTRA_ASSERT(ok);
+
+		ok = m_pAlgo->allocateBuffers();
+		ASTRA_ASSERT(ok);
+
+		if (m_pMinMask || m_pMaxMask) {
+			const CVolumeGeometry2D& volgeom = *m_pReconstruction->getGeometry();
+			astraCUDA::SIRT* pSirt = dynamic_cast<astraCUDA::SIRT*>(m_pAlgo);
+			const float *pfMinMaskData = 0;
+			const float *pfMaxMaskData = 0;
+			if (m_pMinMask) pfMinMaskData = m_pMinMask->getDataConst();
+			if (m_pMaxMask) pfMaxMaskData = m_pMaxMask->getDataConst();
+			ok = pSirt->uploadMinMaxMasks(pfMinMaskData, pfMaxMaskData, volgeom.getGridColCount());
+			ASTRA_ASSERT(ok);
+		}
+
+		m_bAlgoInit = true;
+	}
+
+	CCudaReconstructionAlgorithm2D::run(_iNrIterations);
+}
+
+
+} // namespace astra
+
+#endif // ASTRA_CUDA