From c719280350d4bcfb31c1e38b04a1e559d8a2e2c6 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 24 Sep 2014 10:11:36 +0200 Subject: Remove more obsolete debugging output --- src/CudaCglsAlgorithm3D.cpp | 11 ----------- src/CudaSirtAlgorithm3D.cpp | 10 ---------- 2 files changed, 21 deletions(-) (limited to 'src') diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 37d3592..1b505ed 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -195,8 +195,6 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) float fDetVSize, const float *pfAngles) */ - fprintf(stderr, "01: %d\n", ok); - if (conegeom) { ok &= m_pCgls->setConeGeometry(conegeom->getProjectionCount(), conegeom->getDetectorColCount(), @@ -219,7 +217,6 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) } else { ASTRA_ASSERT(false); } - fprintf(stderr, "02: %d\n", ok); ok &= m_pCgls->enableSuperSampling(m_iVoxelSuperSampling, m_iDetectorSuperSampling); @@ -231,10 +228,8 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) #endif ASTRA_ASSERT(ok); - fprintf(stderr, "03: %d\n", ok); ok &= m_pCgls->init(); - fprintf(stderr, "04: %d\n", ok); ASTRA_ASSERT(ok); @@ -247,7 +242,6 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) ok = m_pCgls->setSinogram(pSinoMem->getDataConst(), m_pSinogram->getGeometry()->getDetectorColCount()); - fprintf(stderr, "1: %d\n", ok); ASTRA_ASSERT(ok); if (m_bUseReconstructionMask) { @@ -262,7 +256,6 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) ok &= m_pCgls->setSinogramMask(pSMaskMem->getDataConst(), m_pSinogramMask->getGeometry()->getDetectorColCount()); } #endif - fprintf(stderr, "2: %d\n", ok); CFloat32VolumeData3DMemory* pReconMem = dynamic_cast(m_pReconstruction); ASTRA_ASSERT(pReconMem); @@ -270,7 +263,6 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) volgeom.getGridColCount()); ASTRA_ASSERT(ok); - fprintf(stderr, "3: %d\n", ok); #if 0 if (m_bUseMinConstraint) @@ -278,15 +270,12 @@ void CCudaCglsAlgorithm3D::run(int _iNrIterations) 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); diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index 179ded8..80b8bcb 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -187,7 +187,6 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) ok &= m_pSirt->setReconstructionGeometry(volgeom.getGridColCount(), volgeom.getGridRowCount(), volgeom.getGridSliceCount()); - fprintf(stderr, "01: %d\n", ok); if (conegeom) { ok &= m_pSirt->setConeGeometry(conegeom->getProjectionCount(), @@ -218,7 +217,6 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) } else { ASTRA_ASSERT(false); } - fprintf(stderr, "02: %d\n", ok); ok &= m_pSirt->enableSuperSampling(m_iVoxelSuperSampling, m_iDetectorSuperSampling); @@ -228,10 +226,8 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) ok &= m_pSirt->enableSinogramMask(); ASTRA_ASSERT(ok); - fprintf(stderr, "03: %d\n", ok); ok &= m_pSirt->init(); - fprintf(stderr, "04: %d\n", ok); ASTRA_ASSERT(ok); @@ -244,7 +240,6 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) ok = m_pSirt->setSinogram(pSinoMem->getDataConst(), m_pSinogram->getGeometry()->getDetectorColCount()); - fprintf(stderr, "1: %d\n", ok); ASTRA_ASSERT(ok); if (m_bUseReconstructionMask) { @@ -257,7 +252,6 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) ASTRA_ASSERT(pSMaskMem); ok &= m_pSirt->setSinogramMask(pSMaskMem->getDataConst(), m_pSinogramMask->getGeometry()->getDetectorColCount()); } - fprintf(stderr, "2: %d\n", ok); CFloat32VolumeData3DMemory* pReconMem = dynamic_cast(m_pReconstruction); ASTRA_ASSERT(pReconMem); @@ -265,21 +259,17 @@ void CCudaSirtAlgorithm3D::run(int _iNrIterations) volgeom.getGridColCount()); ASTRA_ASSERT(ok); - fprintf(stderr, "3: %d\n", ok); if (m_bUseMinConstraint) ok &= m_pSirt->setMinConstraint(m_fMinValue); if (m_bUseMaxConstraint) ok &= m_pSirt->setMaxConstraint(m_fMaxValue); - fprintf(stderr, "4: %d\n", ok); ok &= m_pSirt->iterate(_iNrIterations); ASTRA_ASSERT(ok); - fprintf(stderr, "5: %d\n", ok); ok &= m_pSirt->getReconstruction(pReconMem->getData(), volgeom.getGridColCount()); - fprintf(stderr, "6: %d\n", ok); ASTRA_ASSERT(ok); -- cgit v1.2.3