Changeset 758 for sans/XOP_Dev/MonteCarlo/DebyeSpheres.h

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/DebyeSpheres.h (modified) (1 diff)

sans/XOP_Dev/MonteCarlo/DebyeSpheres.h

@@ -12 +12 @@
 // result is the last parameter, always.
 typedef struct AltiParams {
-    DOUBLE       grid;          // effective c-to-c distance between spheres = 0.62*Rprimary
-    DOUBLE   Rprimary;  //primary sphere radius
+    double       grid;          // effective c-to-c distance between spheres = 0.62*Rprimary
+    double   Rprimary;  //primary sphere radius
         waveHndl rhowavH;       // rho at xyz!!!
         waveHndl zwavH; // z coordinate. ALL are expected to be SP waves
         waveHndl ywavH; // y coordinate.
         waveHndl xwavH; // x coordinate.
-    DOUBLE qval;        // q-value.
+    double qval;        // q-value.
         void* tp;                       //unused void for threadsafe functions
-        DOUBLE result;
+        double result;
 }AltiParams, *AltiParamsPtr;   
  
  
-float PhiQR(float qval, float rval);
-float XYZDistance(float x1, float x2,float y1, float y2,float z1, float z2);
+double PhiQR(double qval, double rval);
+double XYZDistance(double x1, double x2,double y1, double y2,double z1, double z2);
 int DebyeSpheresX(AltiParamsPtr p);