Changeset 0fff338f in sasview for sansmodels/src/sans/models
- Timestamp:
- Apr 23, 2010 9:45:46 AM (14 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/parameters.cpp
rc5607fa r0fff338f 83 83 84 84 GaussianDispersion :: GaussianDispersion() { 85 npts = 1;85 npts = 21; 86 86 width = 0.0; 87 nsigmas = 2;87 nsigmas = 3; 88 88 }; 89 89 … … 143 143 144 144 LogNormalDispersion :: LogNormalDispersion() { 145 npts = 1;145 npts = 21; 146 146 width = 0.0; 147 nsigmas = 2;147 nsigmas = 3; 148 148 }; 149 149 … … 203 203 204 204 SchulzDispersion :: SchulzDispersion() { 205 npts = 1;205 npts = 21; 206 206 width = 0.0; 207 nsigmas = 2;207 nsigmas = 3; 208 208 }; 209 209 … … 284 284 } else { 285 285 for(int i=0; i<npts; i++) { 286 if ( ((*par).has_min==false || _values[i]>(*par).min) 287 && ((*par).has_max==false || _values[i]<(*par).max) ) 288 weights.insert(weights.end(), WeightPoint(_values[i], _weights[i])); 286 double val = _values[i]; //+ value; //ToDo: Talk to Paul and put back the 'value'. 287 if ( ((*par).has_min==false || val>(*par).min) 288 && ((*par).has_max==false || val<(*par).max) ) 289 weights.insert(weights.end(), WeightPoint(val, _weights[i])); 289 290 } 290 291 }
Note: See TracChangeset
for help on using the changeset viewer.