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

Timestamp:

Aug 29, 2018 10:01:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9463ca2

Parents:

ce30949

git-author:

Piotr Rozyczko <rozyczko@…> (08/29/18 09:59:56)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/29/18 10:01:23)

Message:

cherry picking sascalc changes from master SASVIEW-996
minor unit test fixes

File:

• src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) (8 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;
@@ -63 +64 @@
         Cplx temp_fi;
 
+        double count = 0.0;
         int i, j;
-
-        double count = 0.0;
-        //check if this computation is for averaging
 
         cassign(&iqr, 0.0, 0.0);
@@ -78 +77 @@
 
         // Loop over q-values and multiply apply matrix
+
+        //printf("npoints: %d, npix: %d\n", npoints, this->n_pix);
         for(i=0; i<npoints; i++){
                 //I_out[i] = 0.0;
@@ -86 +87 @@
                 //printf("i: %d\n", i);
                 //q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]); // + qz[i]*qz[i]);
+
                 for(j=0; j<this->n_pix; j++){
                         if (this->sldn_val[j]!=0.0
@@ -143 +145 @@
                 I_out[i] *= (1.0E+8 / count); //in cm (unit) / number; //to be multiplied by vol_pix
         }
-        //printf ("count = %d %g %g %g %g\n", count, sldn_val[0],mx_val[0], my_val[0], mz_val[0]);
+        //printf("count = %d %g %g %g %g\n", count, this->sldn_val[0],this->mx_val[0], this->my_val[0], this->mz_val[0]);
 }
 /**
@@ -154 +156 @@
         // 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;
+        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
-    int i, j, k;
         for(i=0; i<npoints; i++){
                 sumj =0.0;
-                for(j=0; j<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
-                        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];
@@ -182 +183 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(k=0; k<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])+
@@ -201 +202 @@
                 }
                 I_out[i] = sumj;
-                if (is_sym == 1){
+                if (this->is_avg == 1) {
                         I_out[i] *= sumj;
                 }
                 I_out[i] *= (1.0E+8 / count); //in cm (unit) / number; //to be multiplied by vol_pix
         }
-        //printf ("count = %d %g %g %g %g\n", count, sldn_val[0],mx_val[0], my_val[0], mz_val[0]);
+        //printf("count = %d %g %g %g %g\n", count, sldn_val[0],mx_val[0], my_val[0], mz_val[0]);
 }