Changeset 8f5b34a in sasview for sansmodels/src/sans/models/c_models/CCoreFourShellModel.cpp

Timestamp:

Dec 12, 2011 9:47:50 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

a189869

Parents:

2371363

Message:

Re #7 Bring back deprecated numpy function (new call signature doesn't quite work)

File:

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

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

@@ -178 +178 @@
         return NULL;
     }
-        result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE);                                                                                  
+    result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE);
         if (result == NULL) {
         const char * message= "Could not create result ";
@@ -218 +218 @@
             
             // Make a new double matrix of same dims
-        result=(PyArrayObject *) PyArray_SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);
+        result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE);
         if (result == NULL){
             const char * message= "Could not create result ";