Changeset 463eb76e in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Jul 25, 2011 3:43:34 PM (13 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:

bc7bc839

Parents:

38155f7

Message:

implementation of pearlneckclace model: need utest and doc

Location:

sansmodels/src/sans/models/c_models

Files:

• CPearlNecklaceModel.cpp (modified) (1 diff)
• pearlnecklace.cpp (modified) (1 diff)

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

@@ -93 +93 @@
         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000));
         PyDict_SetItemString(self->params,"thick_string",Py_BuildValue("d",2.500000000000));
-        PyDict_SetItemString(self->params,"sld_string",Py_BuildValue("d",0.000005000000));
+        PyDict_SetItemString(self->params,"sld_string",Py_BuildValue("d",0.000001000000));
         PyDict_SetItemString(self->params,"edge_separation",Py_BuildValue("d",350.000000000000));
         PyDict_SetItemString(self->params,"sld_pearl",Py_BuildValue("d",0.000001000000));
         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",80.000000000000));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000));
-        PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.000000500000));
+        PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.000006300000));
         // Initialize dispersion / averaging parameter dict
         DispersionVisitor* visitor = new DispersionVisitor();

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

@@ -21 +21 @@
         num_pearls.set_min(0.0);
         sld_pearl = Parameter(1.0e-06);
-        sld_string = Parameter(5.0e-06);
-        sld_solv = Parameter(0.5e-06);
+        sld_string = Parameter(1.0e-06);
+        sld_solv = Parameter(6.3e-06);
     background = Parameter(0.0);