Changeset 5917637 in sasview for sansmodels/src

Timestamp:

Jan 13, 2013 11:22:55 AM (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:

32aba6a

Parents:

3657667

Message:

minor corrections

File:

• sansmodels/src/c_gen/sld2i.cpp (modified) (4 diffs)

sansmodels/src/c_gen/sld2i.cpp

@@ -118 +118 @@
                                                 }
                                         }
+                                //Let's multiply pixel(atomic) volume here
+                                ephase = rcmult(vol_pix[j], ephase);
                                 //up_up
                                 if (inspin > 0.0 && outspin > 0.0){
                                         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);
                                         }
@@ -129 +130 @@
                                         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);
                                         }
@@ -136 +136 @@
                                         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);
                                         }
@@ -143 +142 @@
                                         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);
                                         }