Changeset d36facf in sasview for park-1.2.1/park/lib

Timestamp:

Nov 30, 2011 10:41:07 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

60bca1a

Parents:

0003cc3

Message:

Re #5 fixing park compilation on MSVC (turning code into proper C)

File:

• park-1.2.1/park/lib/resolution.c (modified) (5 diffs)

park-1.2.1/park/lib/resolution.c

@@ -22 +22 @@
     int sign = 1;
 
-    double t;
-    double y;
+    double t = 1.0;
+    double y = 1.0;
     if (x < 0)
         sign = -1;
@@ -179 +179 @@
   const double two_sigma_sq = 2. * sigma * sigma;
   double z, Glo, erflo, erfmin, R;
+  double zhi, Ghi, erfhi, m, b;
   
   z = Qo - Qin[k];
@@ -190 +191 @@
  
     /* Compute the next endpoint */
-    const double zhi = Qo - Qin[k];
-    const double Ghi = exp(-zhi*zhi/two_sigma_sq);
-    const double erfhi = erf(-zhi/(SQRT2*sigma));
-    const double m = (Rin[k]-Rin[k-1])/(Qin[k]-Qin[k-1]);
-    const double b = Rin[k] - m * Qin[k];
+    zhi = Qo - Qin[k];
+    Ghi = exp(-zhi*zhi/two_sigma_sq);
+    erfhi = erf(-zhi/(SQRT2*sigma));
+    m = (Rin[k]-Rin[k-1])/(Qin[k]-Qin[k-1]);
+    b = Rin[k] - m * Qin[k];
 
     /* Add the integrals. */
@@ -235 +236 @@
 {
   int lo,out;
+  double sigma, Qo, limit;
 
   /* FIXME fails if Qin are not sorted; slow if Q not sorted */
@@ -243 +245 @@
   for (out=0; out < N; out++) {
     /* width of resolution window for Q is w = 2 dQ^2. */
-    const double sigma = dQ[out];
-    const double Qo = Q[out];
-    const double limit = sqrt(-2.*sigma*sigma* LOG_RESLIMIT);
+    sigma = dQ[out];
+    Qo = Q[out];
+    limit = sqrt(-2.*sigma*sigma* LOG_RESLIMIT);
 
     /* if (out%20==0) printf("%d: Q,dQ = %g,%g\n",out,Qo,sigma); */