Changeset 758 for sans/XOP_Dev/MonteCarlo/MonteCarlo_Main.c

Timestamp:

Oct 26, 2010 3:32:14 PM (12 years ago)

Author:

srkline

Message:

Changes to DebyeSpheres? to convert everything to double, rather than float.

Changes to MonteCarlo? to use a local definition of round(), since it's not a standard function in Visual Studio's math.h. Easier to just write my own and give it an odd name - MC_round()

File:

• sans/XOP_Dev/MonteCarlo/MonteCarlo_Main.c (modified) (2 diffs)

sans/XOP_Dev/MonteCarlo/MonteCarlo_Main.c

@@ -16 +16 @@
 #include "DebyeSpheres.h"
 
+
+// this function is here simply because MS visual studio does not contain lround() or round() in math.h
+// rounds away from zero
+// -- only used in FindPixel
+long MC_round(double x)
+{
+        if(x == 0)      {
+                return (long)(0);
+        }
+        if(x > 0)       {
+                return (long)(x + 0.5f);
+        } else {                // x < 0
+                return (long)(x - 0.5f);
+        }
+}
+
+
 int
 FindPixel(double testQ, double testPhi, double lam, double sdd,
@@ -29 +46 @@
         theta = 2.0*asin(qy*lam/4.0/pi);
         dy = sdd*tan(theta);
-        *yPixel = lround(yCtr + dy/pixSize);            //corrected 7/2010 to round away from zero, to avoid 2x counts in row 0 and column 0
+//      *yPixel = lround(yCtr + dy/pixSize);            //corrected 7/2010 to round away from zero, to avoid 2x counts in row 0 and column 0
+        *yPixel = MC_round(yCtr + dy/pixSize);          //corrected 7/2010 to round away from zero, to avoid 2x counts in row 0 and column 0
         
         theta = 2.0*asin(qx*lam/4.0/pi);
         dx = sdd*tan(theta);
-        *xPixel = lround(xCtr + dx/pixSize);
+//      *xPixel = lround(xCtr + dx/pixSize);
+        *xPixel = MC_round(xCtr + dx/pixSize);
         
         //if on detector, return xPix and yPix values, otherwise -1