From 3cf63d335ebe392a8c77f0c90395c18150647aeb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Fri, 29 Mar 2019 21:21:29 +0100
Subject: Adjust adjoint to line integral scaling

---
 cuda/2d/algo.cu | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cuda/2d/algo.cu')

diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu
index b4c2864..11422ff 100644
--- a/cuda/2d/algo.cu
+++ b/cuda/2d/algo.cu
@@ -258,10 +258,10 @@ bool ReconAlgo::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPit
 	if (!ok)
 		return false;
 
-	// rescale sinogram to adjust for pixel size
-	processSino<opMul>(D_sinoData, fSinogramScale,
-	                       //1.0f/(fPixelSize*fPixelSize),
-	                       sinoPitch, dims);
+	// rescale sinogram
+	if (fSinogramScale != 1.0f)
+		processSino<opMul>(D_sinoData, fSinogramScale,
+		                   sinoPitch, dims);
 
 	ok = copyVolumeToDevice(pfReconstruction, iReconstructionPitch,
 	                        dims,
@@ -331,11 +331,11 @@ bool ReconAlgo::callBP(float* D_volumeData, unsigned int volumePitch,
 	if (parProjs) {
 		assert(!fanProjs);
 		return BP(D_volumeData, volumePitch, D_projData, projPitch,
-		          dims, parProjs, outputScale);
+		          dims, parProjs, fOutputScale * outputScale);
 	} else {
 		assert(fanProjs);
 		return FanBP(D_volumeData, volumePitch, D_projData, projPitch,
-		             dims, fanProjs, outputScale);
+		             dims, fanProjs, fOutputScale * outputScale);
 	}
 
 }
-- 
cgit v1.2.3