Changeset 7e82256 in sasview

Timestamp:

Nov 13, 2017 11:51:56 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

95d7c4f

Parents:

f926abb

Message:

declare all variables at the start of the block so C89 compilers don't complain

Location:

src/sas/sascalc/calculator/c_extensions

Files:

• sld2i.c (modified) (5 diffs)
• sld2i_module.c (modified) (7 diffs)

src/sas/sascalc/calculator/c_extensions/sld2i.c

@@ -65 +65 @@
 
         double count = 0.0;
-        //check if this computation is for averaging
+        int i, j;
 
         //Assume that pixel volumes are given in vol_pix in A^3 unit
@@ -75 +75 @@
 
         //printf("npoints: %d, npix: %d\n", npoints, this->n_pix);
-        for(int i=0; i<npoints; i++){
+        for(i=0; i<npoints; i++){
                 //I_out[i] = 0.0;
                 sumj_uu = cassign(0.0, 0.0);
@@ -84 +84 @@
                 //q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]); // + qz[i]*qz[i]);
 
-                for(int j=0; j<this->n_pix; j++){
+                for(j=0; j<this->n_pix; j++){
                         if (this->sldn_val[j]!=0.0
                                 ||this->mx_val[j]!=0.0
@@ -156 +156 @@
         double sld_j = 0.0;
         double count = 0.0;
+        int i, j, k;
+
         //Assume that pixel volumes are given in vol_pix in A^3 unit
         // Loop over q-values and multiply apply matrix
-        for(int i=0; i<npoints; i++){
+        for(i=0; i<npoints; i++){
                 sumj =0.0;
-                for(int j=0; j<this->n_pix; j++){
+                for(j=0; j<this->n_pix; j++){
                         //Isotropic: Assumes all slds are real (no magnetic)
                         //Also assumes there is no polarization: No dependency on spin
@@ -177 +179 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(int k=0; k<this->n_pix; k++){
+                                for(k=0; k<this->n_pix; k++){
                                         sld_j =  this->sldn_val[j] * this->sldn_val[k] * this->vol_pix[j] * this->vol_pix[k];
                                         qr = (this->x_val[j]-this->x_val[k])*(this->x_val[j]-this->x_val[k])+

src/sas/sascalc/calculator/c_extensions/sld2i_module.c

@@ -4 +4 @@
 #include <Python.h>
 #include <stdio.h>
-#include <sld2i.h>
+#include "sld2i.h"
 
 #if PY_MAJOR_VERSION < 3
@@ -68 +68 @@
         double outspin;
         double stheta;
+        PyObject *obj;
+        GenI* sld2i;
 
         if (!PyArg_ParseTuple(args, "iOOOOOOOOddd", &is_avg, &x_val_obj, &y_val_obj, &z_val_obj, &sldn_val_obj, &mx_val_obj, &my_val_obj, &mz_val_obj, &vol_pix_obj, &inspin, &outspin, &stheta)) return NULL;
@@ -78 +80 @@
         INVECTOR(mz_val_obj, mz_val, n_mz);
         INVECTOR(vol_pix_obj, vol_pix, n_vol_pix);
-        GenI* sld2i = PyMem_Malloc(sizeof(GenI));
+        sld2i = PyMem_Malloc(sizeof(GenI));
         //printf("sldi:%p\n", sld2i);
         if (sld2i != NULL) {
-                initGenI(sld2i,is_avg,n_x,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
+                initGenI(sld2i,is_avg,(int)n_x,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
         }
-        PyObject *obj = PyCapsule_New(sld2i, "GenI", del_sld2i);
+        obj = PyCapsule_New(sld2i, "GenI", del_sld2i);
         //printf("constructed %p\n", obj);
         return obj;
@@ -100 +102 @@
         double *qy;
         double *I_out;
+        GenI* sld2i;
 
         if (!PyArg_ParseTuple(args, "OOOO",  &gen_obj, &qx_obj, &qy_obj, &I_out_obj)) return NULL;
-        GenI* sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
         INVECTOR(qx_obj, qx, n_qx);
         INVECTOR(qy_obj, qy, n_qy);
@@ -110 +113 @@
         //if(n_q!=n_out) return Py_BuildValue("i",-1);
 
-        genicomXY(sld2i, n_qx, qx, qy, I_out);
+        genicomXY(sld2i, (int)n_qx, qx, qy, I_out);
         //return PyCObject_FromVoidPtr(s, del_genicom);
         return Py_BuildValue("i",1);
@@ -125 +128 @@
         double *q;
         double *I_out;
+        GenI *sld2i;
 
         if (!PyArg_ParseTuple(args, "OOO",  &gen_obj, &q_obj, &I_out_obj)) return NULL;
-        GenI *sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
         INVECTOR(q_obj, q, n_q);
         OUTVECTOR(I_out_obj, I_out, n_out);
@@ -134 +138 @@
         //if (n_q!=n_out) return Py_BuildValue("i",-1);
 
-        genicom(sld2i, n_q, q, I_out);
+        genicom(sld2i, (int)n_q, q, I_out);
         return Py_BuildValue("i",1);
 }