Changeset a8d6888 in sasview for sansmodels/src/sans/models/c_models/CMultiShellModel.cpp

Timestamp:

Aug 24, 2009 10:08:37 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

df4702f

Parents:

2339ff1e

Message:

change the orientation of vector for 2D models

File:

• sansmodels/src/sans/models/c_models/CMultiShellModel.cpp (modified) (3 diffs)

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

@@ -173 +173 @@
     return PyArray_Return(result); 
  }
-/**
- * Function to call to evaluate model
- * @param args: input numpy array  [q[],phi[]]
- * @return: numpy array object 
- */
-static PyObject * evaluateTwoDim( MultiShellModel* 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
@@ -230 +194 @@
    
         if (PyArray_Check(x) && PyArray_Check(y)) {
-            x_len = dims[0]= x->dimensions[0];
-        y_len = dims[1]= y->dimensions[1];
+                
+            x_len = dims[1]= x->dimensions[1];
+        y_len = dims[0]= y->dimensions[0];
             
             // Make a new double matrix of same dims
@@ -244 +209 @@
         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 x_value = *(double *)(x->data + i*x->strides[1]);
+                    double y_value = *(double *)(y->data + j*y->strides[0]);
                         double *result_value = (double *)(result->data +
-                              i*result->strides[0] + j*result->strides[1]);
+                              i*result->strides[1] + j*result->strides[0]);
                         *result_value = (*model)(x_value, y_value);
             }