Changeset b1174ec in sasview

Timestamp:

Jan 10, 2013 3:17:32 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1b28ff5

Parents:

dbc01f2

Message:

more fixes in gen sans

Location:

sansmodels/src/c_gen

Files:

• sld2i.cpp (modified) (9 diffs)
• sld2i.hh (modified) (2 diffs)
• sld2i_module.cpp (modified) (3 diffs)

sansmodels/src/c_gen/sld2i.cpp

@@ -29 +29 @@
  */
 GenI :: GenI(int npix, double* x, double* y, double* z, double* sldn,
-                        double* mx, double* my, double* mz,
+                        double* mx, double* my, double* mz, double* voli,
                         double in_spin, double out_spin,
                         double s_theta) {
@@ -43 +43 @@
         this->my_val = my;
         this->mz_val = mz;
+        this->vol_pix = voli;
         this->inspin = in_spin;
         this->outspin = out_spin;
@@ -52 +53 @@
  */
 void GenI :: genicom(int npoints, double *qx, double *qy, double *I_out){
+        // Assumes that q doesn't have qz component and sld_n is all real
         double q = 0.0;
         //double Pi = 4.0*atan(1.0);
@@ -66 +68 @@
         complex temp_fi;
 
-        int count = 0;
-        //Assume that all pixels are in same size and int * 1A
+        double count = 0.0;
+        //Assume that pixel volumes are given in vol_pix in A^3 unit
         //int x_size = 0; //in Ang
         //int y_size = 0; //in Ang
@@ -81 +83 @@
                 sumj_dd = cassign(0.0, 0.0);            
                 //printf ("%d ", i);
-                q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]);
+                q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]); // + qz[i]*qz[i]);
 
                 for(int j=0; j<n_pix; j++){
@@ -98 +100 @@
                                         comp_sld = cassign(b_sld.uu, 0.0);
                                         temp_fi = cplx_mult(comp_sld, ephase);
+                                        temp_fi = rcmult(vol_pix[j],temp_fi);
                                         sumj_uu = cplx_add(sumj_uu, temp_fi);
                                         }
@@ -104 +107 @@
                                         comp_sld = cassign(b_sld.dd, 0.0);
                                         temp_fi = cplx_mult(comp_sld, ephase);
+                                        temp_fi = rcmult(vol_pix[j],temp_fi);
                                         sumj_dd = cplx_add(sumj_dd, temp_fi);
                                         }
@@ -110 +114 @@
                                         comp_sld = cassign(b_sld.re_ud, b_sld.im_ud);
                                         temp_fi = cplx_mult(comp_sld, ephase);
+                                        temp_fi = rcmult(vol_pix[j],temp_fi);
                                         sumj_ud = cplx_add(sumj_ud, temp_fi);
                                         }
@@ -116 +121 @@
                                         comp_sld = cassign(b_sld.re_du, b_sld.im_du);
                                         temp_fi = cplx_mult(comp_sld, ephase);
+                                        temp_fi = rcmult(vol_pix[j],temp_fi);
                                         sumj_du = cplx_add(sumj_du, temp_fi);
                                         }
                                 if (i == 0){
-                                        count += 1;
+                                        count += vol_pix[j];
                                 }
                         }

sansmodels/src/c_gen/sld2i.hh

@@ -26 +26 @@
         double* my_val;
         double* mz_val;
+        double* vol_pix;
     // spin ratios
     double inspin;
@@ -34 +35 @@
     // Constructor
         GenI(int npix, double* x, double* y, double* z, double* sldn, 
-                        double* mx, double* my, double* mz, 
+                        double* mx, double* my, double* mz, double* voli,
                         double in_spin, double out_spin,
                         double s_theta);

sansmodels/src/c_gen/sld2i_module.cpp

@@ -42 +42 @@
         PyObject *my_val_obj;
         PyObject *mz_val_obj;
+        PyObject *vol_pix_obj;
         Py_ssize_t n_x;
         //PyObject rlimit_obj;
@@ -55 +56 @@
         double* my_val;
         double* mz_val;
+        double* vol_pix;
         double inspin;
         double outspin;
         double stheta;
 
-        if (!PyArg_ParseTuple(args, "iOOOOOOOddd", &n_pix, &x_val_obj, &y_val_obj, &z_val_obj, &sldn_val_obj, &mx_val_obj, &my_val_obj, &mz_val_obj, &inspin, &outspin, &stheta)) return NULL;
+        if (!PyArg_ParseTuple(args, "iOOOOOOOOddd", &n_pix, &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;
         OUTVECTOR(x_val_obj, x_val, n_x);
         OUTVECTOR(y_val_obj, y_val, n_x);
@@ -67 +69 @@
         OUTVECTOR(my_val_obj, my_val, n_x);
         OUTVECTOR(mz_val_obj, mz_val, n_x);
-        GenI* sld2i = new GenI(n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,inspin,outspin,stheta);
+        OUTVECTOR(vol_pix_obj, vol_pix, n_x);
+        GenI* sld2i = new GenI(n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
         return PyCObject_FromVoidPtr(sld2i, del_sld2i);
 }