Changeset 13eb1c4 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Apr 15, 2010 4:41:29 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:

8426622

Parents:

2339249f

Message:

updated sld parameters according to the changes in NIST lib: missed it in the last commit

Location:

sansmodels/src/sans/models/c_models

Files:

• CTriaxialEllipsoidModel.cpp (modified) (5 diffs)
• models.hh (modified) (1 diff)
• triaxialellipsoid.cpp (modified) (4 diffs)

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

@@ -97 +97 @@
         PyDict_SetItemString(self->params,"semi_axisC",Py_BuildValue("d",400.00000000));
         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.00000000));
+        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000630));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000));
-        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.00000530));
+        PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.00000100));
         // Initialize dispersion / averaging parameter dict
         DispersionVisitor* visitor = new DispersionVisitor();
@@ -247 +248 @@
     self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") );
     self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
+    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
+    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") );
     // Read in dispersion parameters
     PyObject* disp_dict;
@@ -327 +329 @@
     self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") );
     self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
+    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
+    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") );
     // Read in dispersion parameters
     PyObject* disp_dict;
@@ -394 +397 @@
     self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") );
     self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
+    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
+    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") );
     // Read in dispersion parameters
     PyObject* disp_dict;
@@ -430 +434 @@
     self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") );
     self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
+    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
+    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") );
     // Read in dispersion parameters
     PyObject* disp_dict;

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

@@ -342 +342 @@
         Parameter semi_axisB;
         Parameter semi_axisC;
-        Parameter contrast;
+        Parameter sldEll;
+        Parameter sldSolv;
         Parameter background;
         Parameter axis_theta;

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

@@ -41 +41 @@
         semi_axisC  = Parameter(400.0, true);
         semi_axisC.set_min(0.0);
-        contrast   = Parameter(5.3e-6);
+        sldEll   = Parameter(1.0e-6);
+        sldSolv   = Parameter(6.3e-6);
         background = Parameter(0.0);
         axis_theta  = Parameter(1.0, true);
@@ -55 +56 @@
  */
 double TriaxialEllipsoidModel :: operator()(double q) {
-        double dp[6];
+        double dp[7];
 
         // Fill parameter array for IGOR library
@@ -63 +64 @@
         dp[2] = semi_axisB();
         dp[3] = semi_axisC();
-        dp[4] = contrast();
-        dp[5] = 0.0;
+        dp[4] = sldEll();
+        dp[5] = sldSolv();
+        dp[6] = 0.0;
 
         // Get the dispersion points for the semi axis A
@@ -128 +130 @@
         dp.semi_axisB     = semi_axisB();
         dp.semi_axisC     = semi_axisC();
-        dp.contrast   = contrast();
+        dp.sldEll   = sldEll();
+        dp.sldSolv   = sldSolv();
         dp.background = 0.0;
         dp.axis_theta  = axis_theta();