Changeset 9bd69098 in sasview for sansmodels/src/sans/models/c_models/CEllipticalCylinderModel.cpp

Timestamp:

Aug 7, 2009 9:10:34 AM (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:

58c6ba6

Parents:

83a25da

Message:

recompiled all due to Alina's new eval(run) function

File:

• sansmodels/src/sans/models/c_models/CEllipticalCylinderModel.cpp (modified) (6 diffs)

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

@@ -22 +22 @@
  *
  */
+#define NO_IMPORT_ARRAY
+#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sans
  
 extern "C" {
 #include <Python.h>
+#include <arrayobject.h>
 #include "structmember.h"
 #include <stdio.h>
@@ -150 +153 @@
     }
 }
-
-
 /**
  * Function to call to evaluate model
- * @param args: input q or [q,phi]
- * @return: function value
+ * @param args: input numpy array q[] 
+ * @return: numpy array object 
  */
-static PyObject * run(CEllipticalCylinderModel *self, PyObject *args) {
-        double q_value, phi_value;
-        PyObject* pars;
-        int npars;
+ 
+static PyObject *evaluateOneDim(EllipticalCylinderModel* model, PyArrayObject *q){
+    PyArrayObject *result;
+   
+    // Check validity of array q , q must be of dimension 1, an array of double
+    if (q->nd != 1 || q->descr->type_num != PyArray_DOUBLE)
+    {
+        //const char * message= "Invalid array: q->nd=%d,type_num=%d\n",q->nd,q->descr->type_num;
+        //PyErr_SetString(PyExc_ValueError , message);
+        return NULL;
+    }
+    result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), 
+                                                                                  PyArray_DOUBLE);
+        if (result == NULL) {
+        const char * message= "Could not create result ";
+        PyErr_SetString(PyExc_RuntimeError , message);
+                return NULL;
+        }
+         for (int i = 0; i < q->dimensions[0]; i++){
+      double q_value  = *(double *)(q->data + i*q->strides[0]);
+      double *result_value = (double *)(result->data + i*result->strides[0]);
+      *result_value =(*model)(q_value);
+        }
+    return PyArray_Return(result); 
+ }
+/**
+ * Function to call to evaluate model
+ * @param args: input numpy array  [q[],phi[]]
+ * @return: numpy array object 
+ */
+static PyObject * evaluateTwoDim( EllipticalCylinderModel* model, 
+                              PyArrayObject *q, PyArrayObject *phi)
+ {
+    PyArrayObject *result;
+    //check validity of input vectors
+    if (q->nd != 1 || q->descr->type_num != PyArray_DOUBLE
+        || phi->nd != 1 || phi->descr->type_num != PyArray_DOUBLE
+        || phi->dimensions[0] != q->dimensions[0]){
+     
+        //const char * message= "Invalid array: q->nd=%d,type_num=%d\n",q->nd,q->descr->type_num;
+        PyErr_SetString(PyExc_ValueError ,"wrong input"); 
+        return NULL;
+    }
+        result= (PyArrayObject *)PyArray_FromDims(q->nd,(int*)(q->dimensions), PyArray_DOUBLE);
+
+        if (result == NULL){
+            const char * message= "Could not create result ";
+        PyErr_SetString(PyExc_RuntimeError , message);
+            return NULL;
+        }
+        
+    for (int i = 0; i < q->dimensions[0]; i++) {
+      double q_value = *(double *)(q->data + i*q->strides[0]);
+      double phi_value = *(double *)(phi->data + i*phi->strides[0]);
+      double *result_value = (double *)(result->data + i*result->strides[0]);
+      if (q_value == 0)
+          *result_value = 0.0;
+      else
+          *result_value = model->evaluate_rphi(q_value, phi_value);
+    }
+    return PyArray_Return(result); 
+ }
+ /**
+ * Function to call to evaluate model
+ * @param args: input numpy array  [x[],y[]]
+ * @return: numpy array object 
+ */
+ static PyObject * evaluateTwoDimXY( EllipticalCylinderModel* model, 
+                              PyArrayObject *x, PyArrayObject *y)
+ {
+    PyArrayObject *result;
+    int i,j, x_len, y_len, dims[2];
+    //check validity of input vectors
+    if (x->nd != 2 || x->descr->type_num != PyArray_DOUBLE
+        || y->nd != 2 || y->descr->type_num != PyArray_DOUBLE
+        || y->dimensions[1] != x->dimensions[0]){
+        const char * message= "evaluateTwoDimXY  expect 2 numpy arrays";
+        PyErr_SetString(PyExc_ValueError , message); 
+        return NULL;
+    }
+   
+        if (PyArray_Check(x) && PyArray_Check(y)) {
+            x_len = dims[0]= x->dimensions[0];
+        y_len = dims[1]= y->dimensions[1];
+            
+            // Make a new double matrix of same dims
+        result=(PyArrayObject *) PyArray_FromDims(2,dims,NPY_DOUBLE);
+        if (result == NULL){
+            const char * message= "Could not create result ";
+        PyErr_SetString(PyExc_RuntimeError , message);
+            return NULL;
+            }
+       
+        /* Do the calculation. */
+        for ( i=0; i< x_len; i++) {
+            for ( j=0; j< y_len; j++) {
+                double x_value = *(double *)(x->data + i*x->strides[0]);
+                    double y_value = *(double *)(y->data + j*y->strides[1]);
+                        double *result_value = (double *)(result->data +
+                              i*result->strides[0] + j*result->strides[1]);
+                        *result_value = (*model)(x_value, y_value);
+            }           
+        }
+        return PyArray_Return(result); 
+        
+        }else{
+                    PyErr_SetString(CEllipticalCylinderModelError, 
+                   "CEllipticalCylinderModel.evaluateTwoDimXY couldn't run.");
+                return NULL;
+                }       
+}
+/**
+ *  evalDistribution function evaluate a model function with input vector
+ *  @param args: input q as vector or [qx, qy] where qx, qy are vectors
+ *
+ */ 
+static PyObject * evalDistribution(CEllipticalCylinderModel *self, PyObject *args){
+        PyObject *qx, *qy;
+        PyArrayObject * pars;
+        int npars ,mpars;
         
         // Get parameters
@@ -194 +311 @@
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
             PyErr_SetString(CEllipticalCylinderModelError, 
-                "CEllipticalCylinderModel.run expects a q value.");
+                "CEllipticalCylinderModel.evalDistribution expects a q value.");
                 return NULL;
         }
-          
-        // Check params
-        if( PyList_Check(pars)==1) {
+    // Check params
+        
+    if(PyArray_Check(pars)==1) {
                 
-                // Length of list should be 2 for I(q,phi)
-            npars = PyList_GET_SIZE(pars); 
-            if(npars!=2) {
+            // Length of list should 1 or 2
+            npars = pars->nd; 
+            if(npars==1) {
+                // input is a numpy array
+                if (PyArray_Check(pars)) {
+                        return evaluateOneDim(self->model, (PyArrayObject*)pars); 
+                    }
+                }else{
+                    PyErr_SetString(CEllipticalCylinderModelError, 
+                   "CEllipticalCylinderModel.evalDistribution expect numpy array of one dimension.");
+                return NULL;
+                }
+    }else if( PyList_Check(pars)==1) {
+        // Length of list should be 2 for I(qx,qy)
+            mpars = PyList_GET_SIZE(pars); 
+            if(mpars!=2) {
                 PyErr_SetString(CEllipticalCylinderModelError, 
-                        "CEllipticalCylinderModel.run expects a double or a list of dimension 2.");
+                        "CEllipticalCylinderModel.evalDistribution expects a list of dimension 2.");
                 return NULL;
             }
-            // We have a vector q, get the q and phi values at which
-            // to evaluate I(q,phi)
-            q_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
-            // Skip zero
-            if (q_value==0) {
-                return Py_BuildValue("d",0.0);
-            }
-                return Py_BuildValue("d",(*(self->model)).evaluate_rphi(q_value,phi_value));
-
-        } else {
-
-                // We have a scalar q, we will evaluate I(q)
-                q_value = CEllipticalCylinderModel_readDouble(pars);            
-                
-                return Py_BuildValue("d",(*(self->model))(q_value));
-        }       
+             qx = PyList_GET_ITEM(pars,0);
+             qy = PyList_GET_ITEM(pars,1);
+             if (PyArray_Check(qx) && PyArray_Check(qy)) {
+                 return evaluateTwoDimXY(self->model, (PyArrayObject*)qx,
+                           (PyArrayObject*)qy);
+                 }else{
+                    PyErr_SetString(CEllipticalCylinderModelError, 
+                   "CEllipticalCylinderModel.evalDistribution expect 2 numpy arrays in list.");
+                return NULL;
+             }
+        }else{
+            PyErr_SetString(CEllipticalCylinderModelError, 
+                   "CEllipticalCylinderModel.evalDistribution couln't be run.");
+            return NULL;
+        }
 }
 
 /**
- * Function to call to evaluate model in cartesian coordinates
- * @param args: input q or [qx, qy]]
+ * Function to call to evaluate model
+ * @param args: input q or [q,phi]
  * @return: function value
  */
-static PyObject * runXY(CEllipticalCylinderModel *self, PyObject *args) {
-        double qx_value, qy_value;
+static PyObject * run(CEllipticalCylinderModel *self, PyObject *args) {
+        double q_value, phi_value;
         PyObject* pars;
         int npars;
@@ -276 +404 @@
         if( PyList_Check(pars)==1) {
                 
+                // Length of list should be 2 for I(q,phi)
+            npars = PyList_GET_SIZE(pars); 
+            if(npars!=2) {
+                PyErr_SetString(CEllipticalCylinderModelError, 
+                        "CEllipticalCylinderModel.run expects a double or a list of dimension 2.");
+                return NULL;
+            }
+            // We have a vector q, get the q and phi values at which
+            // to evaluate I(q,phi)
+            q_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
+            // Skip zero
+            if (q_value==0) {
+                return Py_BuildValue("d",0.0);
+            }
+                return Py_BuildValue("d",(*(self->model)).evaluate_rphi(q_value,phi_value));
+
+        } else {
+
+                // We have a scalar q, we will evaluate I(q)
+                q_value = CEllipticalCylinderModel_readDouble(pars);            
+                
+                return Py_BuildValue("d",(*(self->model))(q_value));
+        }       
+}
+
+/**
+ * Function to call to evaluate model in cartesian coordinates
+ * @param args: input q or [qx, qy]]
+ * @return: function value
+ */
+static PyObject * runXY(CEllipticalCylinderModel *self, PyObject *args) {
+        double qx_value, qy_value;
+        PyObject* pars;
+        int npars;
+        
+        // Get parameters
+        
+            // Reader parameter dictionary
+    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
+    self->model->cyl_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_psi") );
+    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") );
+    self->model->r_minor = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_minor") );
+    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") );
+    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
+    self->model->r_ratio = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_ratio") );
+    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
+    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") );
+    // Read in dispersion parameters
+    PyObject* disp_dict;
+    DispersionVisitor* visitor = new DispersionVisitor();
+    disp_dict = PyDict_GetItemString(self->dispersion, "r_minor");
+    self->model->r_minor.dispersion->accept_as_destination(visitor, self->model->r_minor.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "r_ratio");
+    self->model->r_ratio.dispersion->accept_as_destination(visitor, self->model->r_ratio.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "length");
+    self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "cyl_theta");
+    self->model->cyl_theta.dispersion->accept_as_destination(visitor, self->model->cyl_theta.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "cyl_phi");
+    self->model->cyl_phi.dispersion->accept_as_destination(visitor, self->model->cyl_phi.dispersion, disp_dict);
+    disp_dict = PyDict_GetItemString(self->dispersion, "cyl_psi");
+    self->model->cyl_psi.dispersion->accept_as_destination(visitor, self->model->cyl_psi.dispersion, disp_dict);
+
+        
+        // Get input and determine whether we have to supply a 1D or 2D return value.
+        if ( !PyArg_ParseTuple(args,"O",&pars) ) {
+            PyErr_SetString(CEllipticalCylinderModelError, 
+                "CEllipticalCylinderModel.run expects a q value.");
+                return NULL;
+        }
+          
+        // Check params
+        if( PyList_Check(pars)==1) {
+                
                 // Length of list should be 2 for I(qx, qy))
             npars = PyList_GET_SIZE(pars); 
@@ -350 +553 @@
     {"runXY",      (PyCFunction)runXY     , METH_VARARGS,
       "Evaluate the model at a given Q or Qx, Qy"},
+      
+    {"evalDistribution",  (PyCFunction)evalDistribution , METH_VARARGS,
+      "Evaluate the model at a given Q or Qx, Qy vector "},
     {"reset",    (PyCFunction)reset   , METH_VARARGS,
       "Reset pair correlation"},
@@ -400 +606 @@
 
 
-static PyMethodDef module_methods[] = {
-    {NULL} 
-};
+//static PyMethodDef module_methods[] = {
+//    {NULL} 
+//};
 
 /**