Changeset 761 for sans/XOP_Dev/SANSAnalysis

Timestamp:

Oct 27, 2010 9:56:09 AM (12 years ago)

Author:

srkline

Message:

removing the math.h definitions of M_PI and INFINITY that don't exist in VS8. Just define them locally as needed.

Location:

sans/XOP_Dev/SANSAnalysis/lib

Files:

• 2Y_OneYukawa.c (modified) (1 diff)
• 2Y_PairCorrelation.c (modified) (2 diffs)
• 2Y_TwoYukawa.c (modified) (3 diffs)

sans/XOP_Dev/SANSAnalysis/lib/2Y_OneYukawa.c

@@ -286 +286 @@
                 
                 // loop over all remaining roots
-                min = INFINITY;
+                min = 1e99;
                 selected_root=0;        
                 

sans/XOP_Dev/SANSAnalysis/lib/2Y_PairCorrelation.c

@@ -114 +114 @@
         int n,error,k;
         double alpha,real,imag;
+        double Pi = 3.14159265358979323846264338327950288;   /* pi */
+
         
         for ( n = 0; n < N; n++ ) {
@@ -131 +133 @@
         if ( error == 1 ) 
         {
-                alpha = N * pow( dq, 3 ) / ( 24 * M_PI * M_PI * phi );
+                alpha = N * pow( dq, 3 ) / ( 24 * Pi * Pi * phi );
                 
-                *dr = 2 * M_PI / ( N * dq );  
+                *dr = 2 * Pi / ( N * dq );  
                 for ( k = 0; k < N; k++ )
                 {

sans/XOP_Dev/SANSAnalysis/lib/2Y_TwoYukawa.c

@@ -926 +926 @@
         double dr,qmax,q,dq,min,sum;
         double *sq,*gr;
+        double Pi = 3.14159265358979323846264338327950288;   /* pi */
         
         
@@ -1031 +1032 @@
                 // the maximum q value should be large enough 
                 // to enable a reasoble approximation of g(r)
-                qmax = 16 * 10 * 2 * M_PI;
+                qmax = 16 * 10 * 2 * Pi;
                 dq = qmax / ( n - 1 );
                 
@@ -1042 +1043 @@
                 
                 // loop over all remaining roots
-                min = INFINITY;
+                min = 1e99;
                 selected_root = 10;     
                 sum = 0;