Changeset 1d78e4b in sasview for sansmodels

Timestamp:

Jan 19, 2011 6:00:50 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

a0da535

Parents:

12c5b87

Message:

fixed a bug on dispersion for non-integer nsigmas

Location:

sansmodels/src/sans/models/c_models

Files:

• dispersion_visitor.cpp (modified) (3 diffs)
• parameters.cpp (modified) (12 diffs)
• parameters.hh (modified) (3 diffs)

sansmodels/src/sans/models/c_models/dispersion_visitor.cpp

@@ -27 +27 @@
     PyDict_SetItemString(dict, "npts",  Py_BuildValue("i", disp->npts));
     PyDict_SetItemString(dict, "width", Py_BuildValue("d", disp->width));
-    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("i", disp->nsigmas));
+    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("d", disp->nsigmas));
 #endif
 }
@@ -39 +39 @@
     PyDict_SetItemString(dict, "npts",  Py_BuildValue("i", disp->npts));
     PyDict_SetItemString(dict, "width", Py_BuildValue("d", disp->width));
-    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("i", disp->nsigmas));
+    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("d", disp->nsigmas));
 #endif
 }
@@ -52 +52 @@
     PyDict_SetItemString(dict, "npts",  Py_BuildValue("i", disp->npts));
     PyDict_SetItemString(dict, "width", Py_BuildValue("d", disp->width));
-    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("i", disp->nsigmas));
+    PyDict_SetItemString(dict, "nsigmas", Py_BuildValue("d", disp->nsigmas));
 #endif
 }

sansmodels/src/sans/models/c_models/parameters.cpp

@@ -63 +63 @@
         } else {
                 for(int i=0; i<npts; i++) {
-                        double val = value + width * (1.0*i/float(npts-1) - 0.5);
+                        double val = value + width * (1.0*double(i)/double(npts-1) - 0.5);
 
                         if ( ((*par).has_min==false || val>(*par).min)
@@ -85 +85 @@
         npts  = 21;
         width = 0.0;
-        nsigmas = 3;
+        nsigmas = 3.0;
 };
 
@@ -115 +115 @@
                 width = 0.0;
                 npts  = 1;
-                nsigmas = 3;
+                nsigmas = 3.0;
         }
 
@@ -126 +126 @@
                 for(int i=0; i<npts; i++) {
                         // We cover n(nsigmas) times sigmas on each side of the mean
-                        double val = value + width * (2.0*nsigmas*i/float(npts-1) - nsigmas);
-
+                        double val = value + width * (2.0*nsigmas*double(i)/double(npts-1) - nsigmas);
                         if ( ((*par).has_min==false || val>(*par).min)
                           && ((*par).has_max==false || val<(*par).max)  ) {
@@ -145 +144 @@
         npts  = 21;
         width = 0.0;
-        nsigmas = 3;
+        nsigmas = 3.0;
 };
 
@@ -157 +156 @@
 double lognormal_weight(double mean, double sigma, double x) {
 
-        double sigma2 = pow(sigma, 2);
-        return 1/(x*sigma2) * exp( -pow((log(x) -mean), 2) / (2*sigma2));
+        double sigma2 = pow(sigma, 2.0);
+        return 1.0/(x*sigma2) * exp( -pow((log(x) -mean), 2.0) / (2.0*sigma2));
 
 }
@@ -174 +173 @@
                 width = 0.0;
                 npts  = 1;
-                nsigmas = 3;
+                nsigmas = 3.0;
         }
 
@@ -185 +184 @@
                 for(int i=0; i<npts; i++) {
                         // We cover n(nsigmas) times sigmas on each side of the mean
-                        double val = value + width * (2.0*nsigmas*i/float(npts-1) - nsigmas);
+                        double val = value + width * (2.0*nsigmas*double(i)/double(npts-1) - nsigmas);
 
                         if ( ((*par).has_min==false || val>(*par).min)
@@ -205 +204 @@
         npts  = 21;
         width = 0.0;
-        nsigmas = 3;
+        nsigmas = 3.0;
 };
 
@@ -217 +216 @@
 double schulz_weight(double mean, double sigma, double x) {
         double vary, expo_value;
-    double z = pow(mean/ sigma, 2)-1;
+    double z = pow(mean/ sigma, 2.0)-1.0;
         double R= x/mean;
-        double zz= z+1;
+        double zz= z+1.0;
         double expo;
         expo = zz*log(zz)+z*log(R)-R*zz-log(mean)-lgamma(zz);
@@ -237 +236 @@
                 width = 0.0;
                 npts  = 1;
-                nsigmas = 3;
+                nsigmas = 3.0;
         }
 
@@ -248 +247 @@
                 for(int i=0; i<npts; i++) {
                         // We cover n(nsigmas) times sigmas on each side of the mean
-                        double val = value + width * (2.0*nsigmas*i/float(npts-1) - nsigmas);
+                        double val = value + width * (2.0*nsigmas*double(i)/double(npts-1) - nsigmas);
 
                         if ( ((*par).has_min==false || val>(*par).min)

sansmodels/src/sans/models/c_models/parameters.hh

@@ -68 +68 @@
 public:
         /// Number of sigmas on each side of the mean
-        int nsigmas;
+        double nsigmas;
 
         GaussianDispersion();
@@ -82 +82 @@
 public:
         /// Number of sigmas on each side of the mean
-        int nsigmas;
+        double nsigmas;
 
         SchulzDispersion();
@@ -96 +96 @@
 public:
         /// Number of sigmas on each side of the mean
-        int nsigmas;
+        double nsigmas;
 
         LogNormalDispersion();