Changeset 96b59384 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Aug 4, 2009 6:02:28 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:

8dc0b746

Parents:

b341b16

Message:

added 2D and model descpt.

Location:

sansmodels/src/sans/models/c_models

Files:

• CLamellarPSHGModel.cpp (modified) (4 diffs)
• lamellarPS_HG.cpp (modified) (6 diffs)
• oblate.cpp (modified) (5 diffs)

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

@@ -102 +102 @@
         self->model->deltaH.dispersion->accept_as_source(visitor, self->model->deltaH.dispersion, disp_dict);
         PyDict_SetItemString(self->dispersion, "deltaH", disp_dict);
+        disp_dict = PyDict_New();
+        self->model->spacing.dispersion->accept_as_source(visitor, self->model->spacing.dispersion, disp_dict);
+        PyDict_SetItemString(self->dispersion, "spacing", disp_dict);
 
 
@@ -171 +174 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "deltaH");
     self->model->deltaH.dispersion->accept_as_destination(visitor, self->model->deltaH.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "spacing");
+    self->model->spacing.dispersion->accept_as_destination(visitor, self->model->spacing.dispersion, disp_dict);
 
         
@@ -239 +244 @@
     disp_dict = PyDict_GetItemString(self->dispersion, "deltaH");
     self->model->deltaH.dispersion->accept_as_destination(visitor, self->model->deltaH.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "spacing");
+    self->model->spacing.dispersion->accept_as_destination(visitor, self->model->spacing.dispersion, disp_dict);
 
         
@@ -298 +305 @@
     } else    if (!strcmp(par_name, "deltaH")) {
         self->model->deltaH.dispersion = dispersion;
+    } else    if (!strcmp(par_name, "spacing")) {
+        self->model->spacing.dispersion = dispersion;
     } else {
             PyErr_SetString(CLamellarPSHGModelError,

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

@@ -35 +35 @@
 LamellarPSHGModel :: LamellarPSHGModel() {
         scale      = Parameter(1.0);
-        spacing    = Parameter(40.0);
+        spacing    = Parameter(40.0, true);
+        spacing.set_min(0.0);
         deltaT     = Parameter(10.0, true);
         deltaT.set_min(0.0);
@@ -69 +70 @@
         dp[7] = n_plates();
         dp[8] = caille();
-        dp[9] = background();
-        
+        dp[9] = 0.0;
+
 
         // Get the dispersion points for (deltaT) thickness of the tail
         vector<WeightPoint> weights_deltaT;
         deltaT.get_weights(weights_deltaT);
-        
+
         // Get the dispersion points for (deltaH) thickness of the head
         vector<WeightPoint> weights_deltaH;
         deltaH.get_weights(weights_deltaH);
 
+        // Get the dispersion points for spacing
+        vector<WeightPoint> weights_spacing;
+        spacing.get_weights(weights_spacing);
+
         // Perform the computation, with all weight points
         double sum = 0.0;
         double norm = 0.0;
-        
+
         // Loop over deltaT  weight points
         for(int i=0; i< (int)weights_deltaT.size(); i++) {
@@ -91 +96 @@
                 for(int j=0; j< (int)weights_deltaH.size(); j++) {
                         dp[3] = weights_deltaH[j].value;
+                        // Loop over spacing weight points
+                        for(int k=0; k< (int)weights_spacing.size(); k++) {
+                                dp[1] = weights_spacing[k].value;
 
-                        sum += weights_deltaT[i].weight * weights_deltaH[j].weight *LamellarPS_HG(dp, q);
-                        norm += weights_deltaT[i].weight * weights_deltaH[j].weight;
+                                sum += weights_deltaT[i].weight * weights_deltaH[j].weight *weights_spacing[k].weight
+                                                                *LamellarPS_HG(dp, q);
+                                norm += weights_deltaT[i].weight * weights_deltaH[j].weight * weights_spacing[k].weight;
+                        }
                 }
-                                
         }
         return sum/norm + background();
@@ -105 +114 @@
  * @return: function value
  */
+double LamellarPSHGModel :: 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 lamellarPS_HG
+ * @param q: q-value
+ * @param phi: angle phi
+ * @return: function value
+ */
+double LamellarPSHGModel :: evaluate_rphi(double q, double phi) {
+        return (*this).operator()(q);
+}
+
+/*
 double LamellarPSHGModel :: operator()(double qx, double qy) {
         LamellarPSHGParameters dp;
@@ -118 +144 @@
         dp.caille = caille();
         dp.background    = background();
-        
+
         // Get the dispersion points for the deltaT
         vector<WeightPoint> weights_deltaT;
@@ -134 +160 @@
         for(int i=0; i< (int)weights_deltaT.size(); i++) {
                 dp.deltaT = weights_deltaT[i].value;
-                
+
                 // Loop over deltaH weight points
                 for(int j=0; j< (int)weights_deltaH.size(); j++) {
                         dp.deltaH = weights_deltaH[j].value;
 
-                        sum += weights_deltaT[i].weight *weights_deltaH[j].weight *lamellarPS_HG_analytical_2DXY(&dp, qx, qy);  
-                        norm += weights_deltaT[i].weight * weights_deltaH[j].weight;    
+                        sum += weights_deltaT[i].weight *weights_deltaH[j].weight *lamellarPS_HG_analytical_2DXY(&dp, qx, qy);
+                        norm += weights_deltaT[i].weight * weights_deltaH[j].weight;
                 }
         }
         return sum/norm + background();
 }
+*/
 
 
-/**
- * Function to evaluate 2D scattering function
- * @param pars: parameters of the lamellar
- * @param q: q-value
- * @param phi: angle phi
- * @return: function value
- */
-double LamellarPSHGModel :: evaluate_rphi(double q, double phi) {
-        double qx = q*cos(phi);
-        double qy = q*sin(phi);
-        return (*this).operator()(qx, qy);
-}

sansmodels/src/sans/models/c_models/oblate.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 * OblateForm(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 OblateModel :: 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 oblate
+ * @param q: q-value
+ * @param phi: angle phi
+ * @return: function value
+ */
+double OblateModel :: evaluate_rphi(double q, double phi) {
+        return (*this).operator()(q);
+}
+
+/* disable below for now
+double OblateShellModel :: operator()(double qx, double qy) {
         OblateParameters dp;
         // Fill parameter array
@@ -215 +233 @@
         return sum/norm + background();
 }
-
-/**
- * Function to evaluate 2D scattering function
- * @param pars: parameters of the oblate
- * @param q: q-value
- * @param phi: angle phi
- * @return: function value
- */
-double OblateModel :: evaluate_rphi(double q, double phi) {
-        double qx = q*cos(phi);
-        double qy = q*sin(phi);
-        return (*this).operator()(qx, qy);
-}
+*///