Changeset 54b0650 in sasview for src/sas/sascalc/calculator/c_extensions/sld2i.c

Timestamp:

Nov 7, 2017 11:05:12 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:

f926abb

Parents:

0957bb3a

Message:

fix C interface to sldi after py3 conversion

File:

• src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) (5 diffs)

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

@@ -25 +25 @@
  * @param s_theta: angle (from x-axis) of the up spin in degree
  */
-void initGenI(GenI* this, int npix, double* x, double* y, double* z, double* sldn,
+void initGenI(GenI* this, int is_avg, int npix, double* x, double* y, double* z, double* sldn,
                         double* mx, double* my, double* mz, double* voli,
                         double in_spin, double out_spin,
                         double s_theta) {
+        this->is_avg = is_avg;
         this->n_pix = npix;
         this->x_val = x;
@@ -73 +74 @@
         // Loop over q-values and multiply apply matrix
 
+        //printf("npoints: %d, npix: %d\n", npoints, this->n_pix);
         for(int i=0; i<npoints; i++){
                 //I_out[i] = 0.0;
@@ -150 +152 @@
         // Assumes that q doesn't have qz component and sld_n is all real
         //double Pi = 4.0*atan(1.0);
-        int is_sym = this->n_pix < 0;
         double qr = 0.0;
         double sumj;
         double sld_j = 0.0;
         double count = 0.0;
-        int n_pix = is_sym ? -this->n_pix : this->n_pix;
         //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++){
                 sumj =0.0;
-                for(int j=0; j<n_pix; j++){
+                for(int 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
-                        if (is_sym == 1){
+                        if (this->is_avg == 1){
                                 // approximation for a spherical symmetric particle
                                 qr = sqrt(this->x_val[j]*this->x_val[j]+this->y_val[j]*this->y_val[j]+this->z_val[j]*this->z_val[j])*q[i];
@@ -177 +177 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(int k=0; k<n_pix; k++){
+                                for(int 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])+
@@ -196 +196 @@
                 }
                 I_out[i] = sumj;
-                if (is_sym == 1){
+                if (this->is_avg == 1) {
                         I_out[i] *= sumj;
                 }