Changeset 8dc0b746 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Aug 4, 2009 4:17:28 PM (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:

9188cc1

Parents:

96b59384

Message:

added 2D and corrected polydisp. parameters…

Location:

sansmodels/src/sans/models/c_models

Files:

• COblateModel.cpp (modified) (4 diffs)
• CProlateModel.cpp (modified) (7 diffs)
• prolate.cpp (modified) (5 diffs)

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

@@ -108 +108 @@
         self->model->minor_shell.dispersion->accept_as_source(visitor, self->model->minor_shell.dispersion, disp_dict);
         PyDict_SetItemString(self->dispersion, "minor_shell", disp_dict);
-        disp_dict = PyDict_New();
-        self->model->axis_theta.dispersion->accept_as_source(visitor, self->model->axis_theta.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "axis_theta", disp_dict);
-        disp_dict = PyDict_New();
-        self->model->axis_phi.dispersion->accept_as_source(visitor, self->model->axis_phi.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "axis_phi", disp_dict);
 
 
@@ -187 +181 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "minor_shell");
     self->model->minor_shell.dispersion->accept_as_destination(visitor, self->model->minor_shell.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
-    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
-    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
 
         
@@ -263 +253 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "minor_shell");
     self->model->minor_shell.dispersion->accept_as_destination(visitor, self->model->minor_shell.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
-    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
-    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
 
         
@@ -330 +316 @@
     } else    if (!strcmp(par_name, "minor_shell")) {
         self->model->minor_shell.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "axis_theta")) {
-        self->model->axis_theta.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "axis_phi")) {
-        self->model->axis_phi.dispersion = dispersion;
     } else {
             PyErr_SetString(COblateModelError,

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

@@ -86 +86 @@
         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"minor_core",Py_BuildValue("d",50.000000));
-        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006));
-        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000));
         PyDict_SetItemString(self->params,"major_shell",Py_BuildValue("d",110.000000));
@@ -108 +106 @@
         self->model->minor_shell.dispersion->accept_as_source(visitor, self->model->minor_shell.dispersion, disp_dict);
         PyDict_SetItemString(self->dispersion, "minor_shell", disp_dict);
-        disp_dict = PyDict_New();
-        self->model->axis_theta.dispersion->accept_as_source(visitor, self->model->axis_theta.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "axis_theta", disp_dict);
-        disp_dict = PyDict_New();
-        self->model->axis_phi.dispersion->accept_as_source(visitor, self->model->axis_phi.dispersion, disp_dict);
-        PyDict_SetItemString(self->dispersion, "axis_phi", disp_dict);
 
 
@@ -169 +161 @@
     self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
     self->model->minor_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "minor_core") );
-    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
     self->model->sld_solvent = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_solvent") );
-    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
     self->model->major_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "major_shell") );
@@ -187 +177 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "minor_shell");
     self->model->minor_shell.dispersion->accept_as_destination(visitor, self->model->minor_shell.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
-    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
-    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
 
         
@@ -245 +231 @@
     self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
     self->model->minor_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "minor_core") );
-    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
     self->model->sld_solvent = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_solvent") );
-    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
     self->model->major_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "major_shell") );
@@ -263 +247 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "minor_shell");
     self->model->minor_shell.dispersion->accept_as_destination(visitor, self->model->minor_shell.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
-    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
-    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
-    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
 
         
@@ -330 +310 @@
     } else    if (!strcmp(par_name, "minor_shell")) {
         self->model->minor_shell.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "axis_theta")) {
-        self->model->axis_theta.dispersion = dispersion;
-    } else    if (!strcmp(par_name, "axis_phi")) {
-        self->model->axis_phi.dispersion = dispersion;
     } else {
             PyErr_SetString(CProlateModelError,

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

@@ -45 +45 @@
         sld_solvent = Parameter(6.3e-6);
         background = Parameter(0.0);
-        axis_theta  = Parameter(0.0, true);
-        axis_phi    = Parameter(0.0, true);
 }
 
@@ -67 +65 @@
         dp[5] = contrast();
         dp[6] = sld_solvent();
-        dp[7] = background();
-        
+        dp[7] = 0.0;
+
         // Get the dispersion points for the major core
         vector<WeightPoint> weights_major_core;
@@ -106 +104 @@
                                         dp[4] = weights_minor_shell[l].value;
 
-                                        sum += weights_major_core[i].weight* weights_minor_core[j].weight * weights_major_shell[k].weight 
+                                        sum += weights_major_core[i].weight* weights_minor_core[j].weight * weights_major_shell[k].weight
                                                 * weights_minor_shell[l].weight * ProlateForm(dp, q);
-                                        norm += weights_major_core[i].weight* weights_minor_core[j].weight * weights_major_shell[k].weight 
+                                        norm += weights_major_core[i].weight* weights_minor_core[j].weight * weights_major_shell[k].weight
                                                         * weights_minor_shell[l].weight;
                                 }
@@ -123 +121 @@
  * @return: function value
  */
+double ProlateModel :: operator()(double qx, double qy) {
+        double q = sqrt(qx*qx + qy*qy);
+
+        return (*this).operator()(q);
+}
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the prolate
+ * @param q: q-value
+ * @param phi: angle phi
+ * @return: function value
+ */
+double ProlateModel :: evaluate_rphi(double q, double phi) {
+        return (*this).operator()(q);
+}
+/*
 double ProlateModel :: operator()(double qx, double qy) {
         ProlateParameters dp;
@@ -216 +231 @@
 }
 
-/**
- * Function to evaluate 2D scattering function
- * @param pars: parameters of the prolate
- * @param q: q-value
- * @param phi: angle phi
- * @return: function value
- */
-double ProlateModel :: evaluate_rphi(double q, double phi) {
-        double qx = q*cos(phi);
-        double qy = q*sin(phi);
-        return (*this).operator()(qx, qy);
-}
+*/