Changeset 870f131 in sasview for sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp

Timestamp:

Aug 24, 2009 2:17:42 PM (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:

c8727c5

Parents:

a96d246

Message:

change model orientation

File:

• sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp (modified) (2 diffs)

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

@@ -205 +205 @@
         if (PyArray_Check(x) && PyArray_Check(y)) {
                 
-            x_len = dims[1]= x->dimensions[1];
-        y_len = dims[0]= y->dimensions[0];
+            x_len = dims[1]= x->dimensions[0];
+        y_len = dims[0]= y->dimensions[1];
             
             // Make a new double matrix of same dims
@@ -219 +219 @@
         for ( j=0; j< y_len; j++) {
             for ( i=0; i< x_len; i++) {
-                double x_value = *(double *)(x->data + i*x->strides[1]);
-                    double y_value = *(double *)(y->data + j*y->strides[0]);
+                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[1] + j*result->strides[0]);
+                              j*result->strides[0] + i*result->strides[1]);
                         *result_value = (*model)(x_value, y_value);
             }