Changeset 8f5b34a in sasview for sansmodels/src/sans/models/c_models
- Timestamp:
- Dec 12, 2011 7:47:50 AM (13 years ago)
- 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
- Location:
- sansmodels/src/sans/models/c_models
- Files:
-
- 49 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/CBCCrystalModel.cpp
rab87b61 r8f5b34a 172 172 return NULL; 173 173 } 174 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 174 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 175 175 if (result == NULL) { 176 176 const char * message= "Could not create result "; … … 212 212 213 213 // Make a new double matrix of same dims 214 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);214 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 215 215 if (result == NULL){ 216 216 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CBarBellModel.cpp
rab87b61 r8f5b34a 174 174 return NULL; 175 175 } 176 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 176 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 177 177 if (result == NULL) { 178 178 const char * message= "Could not create result "; … … 214 214 215 215 // Make a new double matrix of same dims 216 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);216 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 217 217 if (result == NULL){ 218 218 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CBinaryHSModel.cpp
rab87b61 r8f5b34a 164 164 return NULL; 165 165 } 166 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 166 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 167 167 if (result == NULL) { 168 168 const char * message= "Could not create result "; … … 204 204 205 205 // Make a new double matrix of same dims 206 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);206 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 207 207 if (result == NULL){ 208 208 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCSParallelepipedModel.cpp
rab87b61 r8f5b34a 184 184 return NULL; 185 185 } 186 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 186 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 187 187 if (result == NULL) { 188 188 const char * message= "Could not create result "; … … 224 224 225 225 // Make a new double matrix of same dims 226 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);226 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 227 227 if (result == NULL){ 228 228 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCappedCylinderModel.cpp
rab87b61 r8f5b34a 174 174 return NULL; 175 175 } 176 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 176 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 177 177 if (result == NULL) { 178 178 const char * message= "Could not create result "; … … 214 214 215 215 // Make a new double matrix of same dims 216 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);216 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 217 217 if (result == NULL){ 218 218 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCoreFourShellModel.cpp
rab87b61 r8f5b34a 178 178 return NULL; 179 179 } 180 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 180 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 181 181 if (result == NULL) { 182 182 const char * message= "Could not create result "; … … 218 218 219 219 // Make a new double matrix of same dims 220 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);220 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 221 221 if (result == NULL){ 222 222 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCoreShellCylinderModel.cpp
rab87b61 r8f5b34a 175 175 return NULL; 176 176 } 177 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 177 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 178 178 if (result == NULL) { 179 179 const char * message= "Could not create result "; … … 215 215 216 216 // Make a new double matrix of same dims 217 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);217 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 218 218 if (result == NULL){ 219 219 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCoreShellEllipsoidModel.cpp
rab87b61 r8f5b34a 179 179 return NULL; 180 180 } 181 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 181 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 182 182 if (result == NULL) { 183 183 const char * message= "Could not create result "; … … 219 219 220 220 // Make a new double matrix of same dims 221 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);221 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 222 222 if (result == NULL){ 223 223 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCoreShellModel.cpp
rab87b61 r8f5b34a 163 163 return NULL; 164 164 } 165 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 165 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 166 166 if (result == NULL) { 167 167 const char * message= "Could not create result "; … … 203 203 204 204 // Make a new double matrix of same dims 205 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);205 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 206 206 if (result == NULL){ 207 207 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CCylinderModel.cpp
rab87b61 r8f5b34a 170 170 return NULL; 171 171 } 172 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 172 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 173 173 if (result == NULL) { 174 174 const char * message= "Could not create result "; … … 210 210 211 211 // Make a new double matrix of same dims 212 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);212 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 213 213 if (result == NULL){ 214 214 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CDiamCylFunc.cpp
rab87b61 r8f5b34a 158 158 return NULL; 159 159 } 160 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 160 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 161 161 if (result == NULL) { 162 162 const char * message= "Could not create result "; … … 198 198 199 199 // Make a new double matrix of same dims 200 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);200 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 201 201 if (result == NULL){ 202 202 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CDiamEllipFunc.cpp
rab87b61 r8f5b34a 158 158 return NULL; 159 159 } 160 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 160 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 161 161 if (result == NULL) { 162 162 const char * message= "Could not create result "; … … 198 198 199 199 // Make a new double matrix of same dims 200 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);200 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 201 201 if (result == NULL){ 202 202 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CEllipsoidModel.cpp
rab87b61 r8f5b34a 170 170 return NULL; 171 171 } 172 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 172 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 173 173 if (result == NULL) { 174 174 const char * message= "Could not create result "; … … 210 210 211 211 // Make a new double matrix of same dims 212 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);212 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 213 213 if (result == NULL){ 214 214 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CEllipticalCylinderModel.cpp
rab87b61 r8f5b34a 178 178 return NULL; 179 179 } 180 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 180 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 181 181 if (result == NULL) { 182 182 const char * message= "Could not create result "; … … 218 218 219 219 // Make a new double matrix of same dims 220 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);220 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 221 221 if (result == NULL){ 222 222 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CFCCrystalModel.cpp
rab87b61 r8f5b34a 172 172 return NULL; 173 173 } 174 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 174 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 175 175 if (result == NULL) { 176 176 const char * message= "Could not create result "; … … 212 212 213 213 // Make a new double matrix of same dims 214 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);214 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 215 215 if (result == NULL){ 216 216 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CFlexCylEllipXModel.cpp
rab87b61 r8f5b34a 170 170 return NULL; 171 171 } 172 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 172 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 173 173 if (result == NULL) { 174 174 const char * message= "Could not create result "; … … 210 210 211 211 // Make a new double matrix of same dims 212 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);212 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 213 213 if (result == NULL){ 214 214 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CFlexibleCylinderModel.cpp
rab87b61 r8f5b34a 166 166 return NULL; 167 167 } 168 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 168 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 169 169 if (result == NULL) { 170 170 const char * message= "Could not create result "; … … 206 206 207 207 // Make a new double matrix of same dims 208 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);208 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 209 209 if (result == NULL){ 210 210 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CFractalModel.cpp
rab87b61 r8f5b34a 160 160 return NULL; 161 161 } 162 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 162 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 163 163 if (result == NULL) { 164 164 const char * message= "Could not create result "; … … 200 200 201 201 // Make a new double matrix of same dims 202 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);202 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 203 203 if (result == NULL){ 204 204 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CFuzzySphereModel.cpp
rab87b61 r8f5b34a 162 162 return NULL; 163 163 } 164 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 164 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 165 165 if (result == NULL) { 166 166 const char * message= "Could not create result "; … … 202 202 203 203 // Make a new double matrix of same dims 204 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);204 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 205 205 if (result == NULL){ 206 206 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CGaussian.cpp
rab87b61 r8f5b34a 153 153 return NULL; 154 154 } 155 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 155 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 156 156 if (result == NULL) { 157 157 const char * message= "Could not create result "; … … 193 193 194 194 // Make a new double matrix of same dims 195 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);195 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 196 196 if (result == NULL){ 197 197 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CHardsphereStructure.cpp
rab87b61 r8f5b34a 155 155 return NULL; 156 156 } 157 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 157 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 158 158 if (result == NULL) { 159 159 const char * message= "Could not create result "; … … 195 195 196 196 // Make a new double matrix of same dims 197 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);197 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 198 198 if (result == NULL){ 199 199 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CHayterMSAStructure.cpp
rab87b61 r8f5b34a 159 159 return NULL; 160 160 } 161 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 161 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 162 162 if (result == NULL) { 163 163 const char * message= "Could not create result "; … … 199 199 200 200 // Make a new double matrix of same dims 201 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);201 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 202 202 if (result == NULL){ 203 203 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CHollowCylinderModel.cpp
rab87b61 r8f5b34a 174 174 return NULL; 175 175 } 176 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 176 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 177 177 if (result == NULL) { 178 178 const char * message= "Could not create result "; … … 214 214 215 215 // Make a new double matrix of same dims 216 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);216 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 217 217 if (result == NULL){ 218 218 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLamellarFFHGModel.cpp
rab87b61 r8f5b34a 163 163 return NULL; 164 164 } 165 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 165 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 166 166 if (result == NULL) { 167 167 const char * message= "Could not create result "; … … 203 203 204 204 // Make a new double matrix of same dims 205 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);205 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 206 206 if (result == NULL){ 207 207 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLamellarModel.cpp
rab87b61 r8f5b34a 158 158 return NULL; 159 159 } 160 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 160 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 161 161 if (result == NULL) { 162 162 const char * message= "Could not create result "; … … 198 198 199 199 // Make a new double matrix of same dims 200 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);200 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 201 201 if (result == NULL){ 202 202 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLamellarPCrystalModel.cpp
rab87b61 r8f5b34a 161 161 return NULL; 162 162 } 163 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 163 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 164 164 if (result == NULL) { 165 165 const char * message= "Could not create result "; … … 201 201 202 202 // Make a new double matrix of same dims 203 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);203 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 204 204 if (result == NULL){ 205 205 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLamellarPSHGModel.cpp
rab87b61 r8f5b34a 169 169 return NULL; 170 170 } 171 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 171 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 172 172 if (result == NULL) { 173 173 const char * message= "Could not create result "; … … 209 209 210 210 // Make a new double matrix of same dims 211 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);211 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 212 212 if (result == NULL){ 213 213 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLamellarPSModel.cpp
rab87b61 r8f5b34a 164 164 return NULL; 165 165 } 166 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 166 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 167 167 if (result == NULL) { 168 168 const char * message= "Could not create result "; … … 204 204 205 205 // Make a new double matrix of same dims 206 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);206 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 207 207 if (result == NULL){ 208 208 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLogNormal.cpp
rab87b61 r8f5b34a 153 153 return NULL; 154 154 } 155 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 155 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 156 156 if (result == NULL) { 157 157 const char * message= "Could not create result "; … … 193 193 194 194 // Make a new double matrix of same dims 195 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);195 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 196 196 if (result == NULL){ 197 197 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CLorentzian.cpp
rab87b61 r8f5b34a 153 153 return NULL; 154 154 } 155 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 155 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 156 156 if (result == NULL) { 157 157 const char * message= "Could not create result "; … … 193 193 194 194 // Make a new double matrix of same dims 195 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);195 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 196 196 if (result == NULL){ 197 197 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CMultiShellModel.cpp
rab87b61 r8f5b34a 167 167 return NULL; 168 168 } 169 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 169 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 170 170 if (result == NULL) { 171 171 const char * message= "Could not create result "; … … 207 207 208 208 // Make a new double matrix of same dims 209 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);209 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 210 210 if (result == NULL){ 211 211 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/COnionModel.cpp
rab87b61 r8f5b34a 239 239 return NULL; 240 240 } 241 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 241 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 242 242 if (result == NULL) { 243 243 const char * message= "Could not create result "; … … 279 279 280 280 // Make a new double matrix of same dims 281 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);281 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 282 282 if (result == NULL){ 283 283 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp
rab87b61 r8f5b34a 178 178 return NULL; 179 179 } 180 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 180 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 181 181 if (result == NULL) { 182 182 const char * message= "Could not create result "; … … 218 218 219 219 // Make a new double matrix of same dims 220 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);220 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 221 221 if (result == NULL){ 222 222 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CPearlNecklaceModel.cpp
rab87b61 r8f5b34a 165 165 return NULL; 166 166 } 167 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 167 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 168 168 if (result == NULL) { 169 169 const char * message= "Could not create result "; … … 205 205 206 206 // Make a new double matrix of same dims 207 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);207 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 208 208 if (result == NULL){ 209 209 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CPoly_GaussCoil.cpp
rab87b61 r8f5b34a 157 157 return NULL; 158 158 } 159 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 159 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 160 160 if (result == NULL) { 161 161 const char * message= "Could not create result "; … … 197 197 198 198 // Make a new double matrix of same dims 199 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);199 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 200 200 if (result == NULL){ 201 201 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CRPAModel.cpp
rab87b61 r8f5b34a 182 182 return NULL; 183 183 } 184 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 184 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 185 185 if (result == NULL) { 186 186 const char * message= "Could not create result "; … … 222 222 223 223 // Make a new double matrix of same dims 224 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);224 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 225 225 if (result == NULL){ 226 226 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CReflAdvModel.cpp
rab87b61 r8f5b34a 224 224 return NULL; 225 225 } 226 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 226 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 227 227 if (result == NULL) { 228 228 const char * message= "Could not create result "; … … 264 264 265 265 // Make a new double matrix of same dims 266 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);266 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 267 267 if (result == NULL){ 268 268 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CReflModel.cpp
rab87b61 r8f5b34a 200 200 return NULL; 201 201 } 202 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 202 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 203 203 if (result == NULL) { 204 204 const char * message= "Could not create result "; … … 240 240 241 241 // Make a new double matrix of same dims 242 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);242 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 243 243 if (result == NULL){ 244 244 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSCCrystalModel.cpp
rab87b61 r8f5b34a 172 172 return NULL; 173 173 } 174 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 174 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 175 175 if (result == NULL) { 176 176 const char * message= "Could not create result "; … … 212 212 213 213 // Make a new double matrix of same dims 214 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);214 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 215 215 if (result == NULL){ 216 216 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSLDCalFunc.cpp
rab87b61 r8f5b34a 159 159 return NULL; 160 160 } 161 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 161 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 162 162 if (result == NULL) { 163 163 const char * message= "Could not create result "; … … 199 199 200 200 // Make a new double matrix of same dims 201 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);201 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 202 202 if (result == NULL){ 203 203 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSchulz.cpp
rab87b61 r8f5b34a 153 153 return NULL; 154 154 } 155 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 155 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 156 156 if (result == NULL) { 157 157 const char * message= "Could not create result "; … … 193 193 194 194 // Make a new double matrix of same dims 195 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);195 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 196 196 if (result == NULL){ 197 197 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSphereModel.cpp
rab87b61 r8f5b34a 158 158 return NULL; 159 159 } 160 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 160 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 161 161 if (result == NULL) { 162 162 const char * message= "Could not create result "; … … 198 198 199 199 // Make a new double matrix of same dims 200 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);200 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 201 201 if (result == NULL){ 202 202 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSphereSLDModel.cpp
rab87b61 r8f5b34a 216 216 return NULL; 217 217 } 218 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 218 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 219 219 if (result == NULL) { 220 220 const char * message= "Could not create result "; … … 256 256 257 257 // Make a new double matrix of same dims 258 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);258 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 259 259 if (result == NULL){ 260 260 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CSquareWellStructure.cpp
rab87b61 r8f5b34a 157 157 return NULL; 158 158 } 159 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 159 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 160 160 if (result == NULL) { 161 161 const char * message= "Could not create result "; … … 197 197 198 198 // Make a new double matrix of same dims 199 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);199 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 200 200 if (result == NULL){ 201 201 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CStackedDisksModel.cpp
rab87b61 r8f5b34a 177 177 return NULL; 178 178 } 179 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 179 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 180 180 if (result == NULL) { 181 181 const char * message= "Could not create result "; … … 217 217 218 218 // Make a new double matrix of same dims 219 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);219 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 220 220 if (result == NULL){ 221 221 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CStickyHSStructure.cpp
rab87b61 r8f5b34a 157 157 return NULL; 158 158 } 159 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 159 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 160 160 if (result == NULL) { 161 161 const char * message= "Could not create result "; … … 197 197 198 198 // Make a new double matrix of same dims 199 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);199 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 200 200 if (result == NULL){ 201 201 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CTriaxialEllipsoidModel.cpp
rab87b61 r8f5b34a 178 178 return NULL; 179 179 } 180 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 180 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 181 181 if (result == NULL) { 182 182 const char * message= "Could not create result "; … … 218 218 219 219 // Make a new double matrix of same dims 220 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);220 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 221 221 if (result == NULL){ 222 222 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/CVesicleModel.cpp
rab87b61 r8f5b34a 162 162 return NULL; 163 163 } 164 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 164 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 165 165 if (result == NULL) { 166 166 const char * message= "Could not create result "; … … 202 202 203 203 // Make a new double matrix of same dims 204 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);204 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 205 205 if (result == NULL){ 206 206 const char * message= "Could not create result "; -
sansmodels/src/sans/models/c_models/classTemplate.txt
rab87b61 r8f5b34a 143 143 return NULL; 144 144 } 145 result = (PyArrayObject *)PyArray_SimpleNew(q->nd, (npy_intp *)(q->dimensions), PyArray_DOUBLE); 145 result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), PyArray_DOUBLE); 146 146 if (result == NULL) { 147 147 const char * message= "Could not create result "; … … 183 183 184 184 // Make a new double matrix of same dims 185 result=(PyArrayObject *) PyArray_ SimpleNew(1,(npy_intp *)dims,NPY_DOUBLE);185 result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE); 186 186 if (result == NULL){ 187 187 const char * message= "Could not create result ";
Note: See TracChangeset
for help on using the changeset viewer.