X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Freconstruct.cpp;h=3497882730241d72357d87613d8a0a6cf9031ef7;hp=0c5cf0eb925c4e2a2a25028d637766856d422d2e;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=c953cbb6ffc2fd50e736230f4e6976a025983cff diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp index 0c5cf0e..3497882 100644 --- a/libctsim/reconstruct.cpp +++ b/libctsim/reconstruct.cpp @@ -8,7 +8,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: reconstruct.cpp,v 1.15 2001/03/01 07:30:49 kevin Exp $ +** $Id$ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -52,11 +52,14 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* filterGenerationName, const char* const interpName, - int interpFactor, const char* const backprojectName, const int iTrace, SGP* pSGP) - : m_rProj(rProj), m_rImagefile(rIF), m_pProcessSignal(0), m_pBackprojector(0), m_iTrace(iTrace), - m_bFail(false), m_adPlotXAxis(0) + int interpFactor, const char* const backprojectName, const int iTrace, + ReconstructionROI* pROI, bool bRebinToParallel, SGP* pSGP) + : m_rOriginalProj(rProj), + m_pProj(bRebinToParallel ? m_rOriginalProj.interpolateToParallel() : &m_rOriginalProj), + m_rImagefile(rIF), m_pProcessSignal(0), m_pBackprojector(0), + m_iTrace(iTrace), m_bRebinToParallel(bRebinToParallel), m_bFail(false), m_adPlotXAxis(0) { - m_nFilteredProjections = m_rProj.nDet() * interpFactor; + m_nFilteredProjections = m_pProj->nDet() * interpFactor; #ifdef HAVE_BSPLINE_INTERP int spline_order = 0, zoom_factor = 0; @@ -68,10 +71,10 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const ch } #endif - double filterBW = 1. / m_rProj.detInc(); - m_pProcessSignal = new ProcessSignal (filterName, filterMethodName, filterBW, m_rProj.detInc(), - m_rProj.nDet(), filt_param, "spatial", filterGenerationName, zeropad, interpFactor, iTrace, - m_rProj.geometry(), m_rProj.focalLength(), m_rProj.sourceDetectorLength(), pSGP); + double filterBW = 1. / m_pProj->detInc(); + m_pProcessSignal = new ProcessSignal (filterName, filterMethodName, filterBW, m_pProj->detInc(), + m_pProj->nDet(), filt_param, "spatial", filterGenerationName, zeropad, interpFactor, iTrace, + m_pProj->geometry(), m_pProj->focalLength(), m_pProj->sourceDetectorLength(), pSGP); if (m_pProcessSignal->fail()) { m_bFail = true; @@ -81,7 +84,7 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const ch return; } - m_pBackprojector = new Backprojector (m_rProj, m_rImagefile, backprojectName, interpName, interpFactor); + m_pBackprojector = new Backprojector (*m_pProj, m_rImagefile, backprojectName, interpName, interpFactor, pROI); if (m_pBackprojector->fail()) { m_bFail = true; m_strFailMessage = "Error creating backprojector: "; @@ -92,17 +95,20 @@ Reconstructor::Reconstructor (const Projections& rProj, ImageFile& rIF, const ch } #ifdef HAVE_SGP - m_adPlotXAxis = new double [m_rProj.nDet()]; - double x = - ((m_rProj.nDet() - 1) / 2) * m_rProj.detInc(); - double xInc = m_rProj.detInc(); + m_adPlotXAxis = new double [m_pProj->nDet()]; + double x = - ((m_pProj->nDet() - 1) / 2) * m_pProj->detInc(); + double xInc = m_pProj->detInc(); - for (int i = 0; i < m_rProj.nDet(); i++, x += xInc) + for (int i = 0; i < m_pProj->nDet(); i++, x += xInc) m_adPlotXAxis[i] = x; #endif } Reconstructor::~Reconstructor () { + if (m_bRebinToParallel) + delete m_pProj; + delete m_pBackprojector; delete m_pProcessSignal; delete m_adPlotXAxis; @@ -138,7 +144,7 @@ Reconstructor::plotFilter (SGP* pSGP) void Reconstructor::reconstructAllViews () { - reconstructView (0, m_rProj.nView()); + reconstructView (0, m_pProj->nView()); postProcessing(); } @@ -155,24 +161,24 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool double* adFilteredProj = new double [m_nFilteredProjections]; // filtered projections if (iViewCount <= 0) - iViewCount = m_rProj.nView() - iStartView; + iViewCount = m_pProj->nView() - iStartView; for (int iView = iStartView; iView < (iStartView + iViewCount); iView++) { if (m_iTrace == Trace::TRACE_CONSOLE) - std::cout <<"Reconstructing view " << iView << " (last = " << m_rProj.nView() - 1 << ")\n"; + std::cout <<"Reconstructing view " << iView << " (last = " << m_pProj->nView() - 1 << ")\n"; - const DetectorArray& rDetArray = m_rProj.getDetectorArray (iView); + const DetectorArray& rDetArray = m_pProj->getDetectorArray (iView); const DetectorValue* detval = rDetArray.detValues(); m_pProcessSignal->filterSignal (detval, adFilteredProj); #ifdef HAVE_BSPLINE_INTERP if (interp_type == I_BSPLINE) - bspline (m_rProj.nDet(), zoom_factor, spline_order, adFilteredProj, adFilteredProj); + bspline (m_pProj->nDet(), zoom_factor, spline_order, adFilteredProj, adFilteredProj); #ifdef HAVE_SGP if (trace >= Trace::TRACE_PLOT && interp_type == I_BSPLINE && pSGP) { - bspline (m_rProj.nDet(), zoom_factor, spline_order, adFilteredProj, adFilteredProj); + bspline (m_pProj->nDet(), zoom_factor, spline_order, adFilteredProj, adFilteredProj); ezplot_1d (adFilteredProj, m_nFilteredProjections); } #endif @@ -200,14 +206,14 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool ezplotProj.ezset ("box."); ezplotProj.ezset ("grid."); #if 0 // workaround c++ optimizer bug, now disabled by using /O1 in code - double* pdDetval = new double [m_rProj.nDet()]; - for (unsigned int id = 0; id < m_rProj.nDet(); id++) { + double* pdDetval = new double [m_pProj->nDet()]; + for (unsigned int id = 0; id < m_pProj->nDet(); id++) { pdDetval[id] = detval[id]; } - ezplotProj.addCurve (m_adPlotXAxis, pdDetval, m_rProj.nDet()); + ezplotProj.addCurve (m_adPlotXAxis, pdDetval, m_pProj->nDet()); delete pdDetval; #else - ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet()); + ezplotProj.addCurve (m_adPlotXAxis, detval, m_pProj->nDet()); #endif pSGP->setTextPointSize (12); ezplotProj.plot (pSGP);