Changeset 0fff338f in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Apr 23, 2010 11:45:46 AM (15 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:

f7a5c7e

Parents:

0a8759f

Message:

changed the defaults of polydisp param

File:

• sansmodels/src/sans/models/c_models/parameters.cpp (modified) (4 diffs)

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

@@ -83 +83 @@
 
 GaussianDispersion :: GaussianDispersion() {
-        npts  = 1;
+        npts  = 21;
         width = 0.0;
-        nsigmas = 2;
+        nsigmas = 3;
 };
 
@@ -143 +143 @@
 
 LogNormalDispersion :: LogNormalDispersion() {
-        npts  = 1;
+        npts  = 21;
         width = 0.0;
-        nsigmas = 2;
+        nsigmas = 3;
 };
 
@@ -203 +203 @@
 
 SchulzDispersion :: SchulzDispersion() {
-        npts  = 1;
+        npts  = 21;
         width = 0.0;
-        nsigmas = 2;
+        nsigmas = 3;
 };
 
@@ -284 +284 @@
         } else {
                 for(int i=0; i<npts; i++) {
-                        if ( ((*par).has_min==false || _values[i]>(*par).min)
-                          && ((*par).has_max==false || _values[i]<(*par).max)  )
-                                weights.insert(weights.end(), WeightPoint(_values[i], _weights[i]));
+                        double val = _values[i]; //+ value;  //ToDo: Talk to Paul and put back the 'value'.
+                        if ( ((*par).has_min==false || val>(*par).min)
+                          && ((*par).has_max==false || val<(*par).max)  )
+                                weights.insert(weights.end(), WeightPoint(val, _weights[i]));
                 }
         }