Changeset e08bd5b in sasview for sansmodels/src/python_wrapper

Timestamp:

Feb 29, 2012 8:48:08 AM (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:

2d6f1f1

Parents:

6319646

Message:

c models fix: scale fix for P*S

Location:

sansmodels/src/python_wrapper

Files:

• classTemplate.txt (modified) (2 diffs)
• modelTemplate.txt (modified) (1 diff)

sansmodels/src/python_wrapper/classTemplate.txt

@@ -331 +331 @@
 }
 /**
+ * Function to call to cal the ratio shell volume/ total volume
+ * @return: the ratio shell volume/ total volume 
+ */
+static PyObject * calculate_VR([PYTHONCLASS] *self) {
+
+        // Get parameters
+        
+        [READDICTIONARY]
+                
+        return Py_BuildValue("d",(*(self->model)).calculate_VR());
+
+}
+/**
  * Function to call to evaluate model in cartesian coordinates
  * @param args: input q or [qx, qy]]
@@ -416 +429 @@
     {"calculate_ER",      (PyCFunction)calculate_ER     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
-      
+    {"calculate_VR",      (PyCFunction)calculate_VR     , METH_VARARGS,
+      "Evaluate VR"},    
     {"evalDistribution",  (PyCFunction)evalDistribution , METH_VARARGS,
       "Evaluate the model at a given Q or Qx, Qy vector "},

sansmodels/src/python_wrapper/modelTemplate.txt

@@ -129 +129 @@
         return [CPYTHONCLASS].calculate_ER(self)
         
+    def calculate_VR(self):
+        """ 
+        Calculate the volf ratio for P(q)*S(q)
+        
+        :return: the value of the volf ratio
+        
+        """       
+        return [CPYTHONCLASS].calculate_VR(self)
+              
     def set_dispersion(self, parameter, dispersion):
         """