Changeset 673 for sans/XOP_Dev/MonteCarlo/MonteCarlo.c

Timestamp:

Apr 9, 2010 1:46:29 PM (12 years ago)

Author:

srkline

Message:

Changing the round() call to properly return (long) and be compatibile with VC8.

File:

• sans/XOP_Dev/MonteCarlo/MonteCarlo.c (modified) (7 diffs)

sans/XOP_Dev/MonteCarlo/MonteCarlo.c

@@ -13 +13 @@
 #include "DebyeSpheres.h"
 
-static int gCallSpinProcess = 1;                // Set to 1 to all user abort (cmd dot) and background processing.
+//static int gCallSpinProcess = 1;              // Set to 1 to all user abort (cmd dot) and background processing.
 
 //////////
@@ -60 +60 @@
         long n1,n2,n3;
         double dth,zz,xx,yy,phi;
-        double theta,ran,ll,rr,ttot;
+        double theta,ran,ll,rr;
         long done,find_theta,err;               //used as logicals
         long xPixel,yPixel;
@@ -73 +73 @@
         // for accessing the 2D wave data, direct method (see the WaveAccess example XOP)
         waveHndl wavH;
-        int waveType,hState;
+//      int waveType,hState;
         long numDimensions;
         long dimensionSizes[MAX_DIMENSIONS+1];
-        char* dataStartPtr;
-        long dataOffset;
-        long numRows, numColumns,numRows_ran_dev;
-        double *dp0, *dp, value[2];                             // Pointers used for double data.
+//      char* dataStartPtr;
+//      long dataOffset;
+//      long numRows, numColumns;
+        long numRows_ran_dev;
+//      double *dp0, *dp; 
+        double value[2];                                // Pointers used for double data.
         long seed;
         long indices[MAX_DIMENSIONS];
         
-        char buf[256];
+//      char buf[256];
                 
         /* check that wave handles are all valid */
@@ -154 +156 @@
         sig_incoh = inputWave[9];
         sig_sas = inputWave[10];
-        xCtr_long = round(xCtr);
-        yCtr_long = round(yCtr);
+        xCtr_long = (long)(xCtr+0.5);
+        yCtr_long = (long)(yCtr+0.5);
         
         dummy = MDGetWaveScaling(p->ran_devH, 0, &delta, &left);                //0 is the rows
@@ -368 +370 @@
                                                 //Choose index for scattering angle array.
                                                 //IND = NINT(THETA_z/DTH + 0.4999999)
-                                                ind = round(theta_z/dth + 0.4999999);           //round is eqivalent to nint()
+                                                ind = (long)(theta_z/dth + 0.4999999);          //round is eqivalent to nint()
                                                 nt[ind] += 1;                   //Increment bin for angle.
                                                 //Increment angle array for single scattering events.
@@ -408 +410 @@
                                                 //indices[0] = xCtr_long;               //don't put everything in one pixel
                                                 //indices[1] = yCtr_long;
-                                                indices[0] = (long)round(xCtr+xx/pixSize);
-                                                indices[1] = (long)round(yCtr+yy/pixSize);
+                                                indices[0] = (long)(xCtr+xx/pixSize+0.5);
+                                                indices[1] = (long)(yCtr+yy/pixSize+0.5);
                                                 // check for valid indices - got an XOP error, probably from here
                                                 if(indices[0] > 127) indices[0] = 127;
@@ -483 +485 @@
         theta = 2.0*asin(qy*lam/4.0/pi);
         dy = sdd*tan(theta);
-        *yPixel = round(yCtr + dy/pixSize);
+        *yPixel = (long)(yCtr + dy/pixSize+0.5);
         
         theta = 2.0*asin(qx*lam/4.0/pi);
         dx = sdd*tan(theta);
-        *xPixel = round(xCtr + dx/pixSize);
+        *xPixel = (long)(xCtr + dx/pixSize+0.5);
 
         //if on detector, return xPix and yPix values, otherwise -1