Changeset 623 for sans/XOP_Dev/MonteCarlo/MonteCarlo.h

Timestamp:

Jan 28, 2010 6:09:34 PM (13 years ago)

Author:

srkline

Message:

Updated the MonteCarlo? code to allow 4 processors, but simply copying the function 4 times, and defining 4 different random number generators. Still can't figure out what the problem is with threading a single version, but not worth the effort. Copy/paste is way faster.

Also added some simple (non-optimized) calculations for using Debye's sphere method. These are largely undocumented at this point - so see the code. These are XOP versions of the old ipf code I've used in the past, and stripped of the now-obsolete AltiVec? code (I now lose the 4x speedup from the vectorization...)

File:

• sans/XOP_Dev/MonteCarlo/MonteCarlo.h (modified) (3 diffs)

sans/XOP_Dev/MonteCarlo/MonteCarlo.h

@@ -41 +41 @@
         waveHndl inputWaveH;
         void* tp;                               //unused void for ThreadSafe functions
-        double result;          // return value is unused, save for error if needed
+        double retVal;          // return value is unused, save for error if needed
 };
 typedef struct MC_Params MC_Params;
@@ -52 +52 @@
 int Monte_SANSX(MC_ParamsPtr p);
 int Monte_SANSX2(MC_ParamsPtr p);
+int Monte_SANSX3(MC_ParamsPtr p);
+int Monte_SANSX4(MC_ParamsPtr p);
 int FindPixel(double testQ, double testPhi, double lam, double sdd, double pixSize, double xCtr, double yCtr, long *xPixel, long *yPixel);
 int NewDirection(double *vx, double *vy, double *vz, double theta, double phi);
@@ -57 +59 @@
 float ran1(long *idum);
 float ran3(long *idum);
+float ran1a(long *idum);
+float ran3a(long *idum);
 double locate_interp(double xx[], long n, double x);