fix cent_x and cent_y in FFT mode

842b99dc · David Rohr · d41e474a · 842b99dc · 842b99dc
Commit 842b99dc authored Apr 19, 2014 by David Rohr
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

bioem.cpp bioem.cpp +1 -1

bioem_algorithm.h bioem_algorithm.h +3 -3

No files found.
--- a/bioem.cpp
+++ b/bioem.cpp
@@ -178,7 +178,7 @@ int bioem::configure(int ac, char* av[])
 int bioem::precalculate()
 {
 	// **************************************************************************************
-	/* Precalculating Routine of Orientation grids, Map crosscorrelations and CTF Kernels */
+	// **Precalculating Routine of Orientation grids, Map crosscorrelations and CTF Kernels**
 	// **************************************************************************************

 	// Generating Grids of orientations

--- a/bioem_algorithm.h
+++ b/bioem_algorithm.h
@@ -114,18 +114,18 @@ __device__ static inline void doRefMapFFT(const int iRefMap, const int iOrient,
 		}
 		for (int cent_y = param.NumberPixels - param.maxDisplaceCenter; cent_y < param.NumberPixels; cent_y = cent_y + param.GridSpaceCenter)
 		{
-			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), cent_x, param.NumberPixels - cent_y, pProb, param, RefMap);
+			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), cent_x, cent_y - param.NumberPixels, pProb, param, RefMap);
 		}
 	}
 	for (int cent_x = param.NumberPixels - param.maxDisplaceCenter; cent_x < param.NumberPixels; cent_x = cent_x + param.GridSpaceCenter)
 	{
 		for (int cent_y = 0; cent_y < param.maxDisplaceCenter; cent_y = cent_y + param.GridSpaceCenter)
 		{
-			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), param.NumberPixels - cent_x, cent_y, pProb, param, RefMap);
+			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), cent_x - param.NumberPixels, cent_y, pProb, param, RefMap);
 		}
 		for (int cent_y = param.NumberPixels - param.maxDisplaceCenter; cent_y <= param.NumberPixels; cent_y = cent_y + param.GridSpaceCenter)
 		{
-			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), param.NumberPixels - cent_x, param.NumberPixels - cent_y, pProb, param, RefMap);
+			calProb(iRefMap, iOrient, iConv, sumC, sumsquareC, (myfloat_t) lCC[cent_x * param.NumberPixels + cent_y] / (myfloat_t) (param.NumberPixels * param.NumberPixels), cent_x - param.NumberPixels, cent_y - param.NumberPixels pProb, param, RefMap);
 		}
 	}
 }