Changeset 07da749 in sasview for sansmodels/src/sans

Timestamp:

Apr 21, 2009 12:26:33 PM (16 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:

f6160a2

Parents:

2501cf7

Message:

revert code

File:

• sansmodels/src/sans/models/c_models/parameters.cpp (modified) (1 diff)

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

@@ -155 +155 @@
         double value = (*par)();
 
+        if (npts<2) {
+                weights.insert(weights.end(), WeightPoint(value, 1.0));
+        } else {
                 for(int i=0; i<npts; i++) {
-                        double val = value + _values[i];
-                        if ( ((*par).has_min==false || val>(*par).min)
-                          && ((*par).has_max==false || val<(*par).max)  )
-                                weights.insert(weights.end(), WeightPoint(val, _weights[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]));
                 }
-
-}
-
-
+        }
+}
 /**
  * Method to set the weights