Changeset c451be9 in sasview for sansmodels/src/sans/models/c_models/parallelepiped.cpp

Timestamp:

Jan 7, 2010 5:04:25 PM (15 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:

dfa8832

Parents:

4cbaf35

Message:

corrections on the definition of polydispersity as suggested by steve K: should be normalized by average volume

File:

• sansmodels/src/sans/models/c_models/parallelepiped.cpp (modified) (7 diffs)

sansmodels/src/sans/models/c_models/parallelepiped.cpp

@@ -84 +84 @@
         double sum = 0.0;
         double norm = 0.0;
+        double vol = 0.0;
 
         // Loop over short_edgeA weight points
@@ -96 +97 @@
                         for(int k=0; k< (int)weights_long_c.size(); k++) {
                                 dp[3] = weights_long_c[k].value;
+                                //Un-normalize  by volume
                                 sum += weights_short_a[i].weight * weights_short_b[j].weight
-                                        * weights_long_c[k].weight * Parallelepiped(dp, q);
+                                        * weights_long_c[k].weight * Parallelepiped(dp, q)
+                                        * weights_short_a[i].value*weights_short_b[j].value
+                                        * weights_long_c[k].value;
+                                //Find average volume
+                                vol += weights_short_a[i].weight * weights_short_b[j].weight
+                                        * weights_long_c[k].weight
+                                        * weights_short_a[i].value * weights_short_b[j].value
+                                        * weights_long_c[k].value;
 
                                 norm += weights_short_a[i].weight
@@ -104 +113 @@
                 }
         }
+        if (vol != 0.0 && norm != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm);}
 
         return sum/norm + background();
@@ -155 +167 @@
         double sum = 0.0;
         double norm = 0.0;
+        double norm_vol = 0.0;
+        double vol = 0.0;
 
         // Loop over radius weight points
@@ -179 +193 @@
                                                 for(int n=0; n< (int)weights_parallel_psi.size(); n++) {
                                                         dp.parallel_psi = weights_parallel_psi[n].value;
-
+                                                        //Un-normalize by volume
                                                         double _ptvalue = weights_short_a[i].weight
                                                                 * weights_short_b[j].weight
@@ -186 +200 @@
                                                                 * weights_parallel_phi[m].weight
                                                                 * weights_parallel_psi[n].weight
-                                                                * parallelepiped_analytical_2DXY(&dp, qx, qy);
+                                                                * parallelepiped_analytical_2DXY(&dp, qx, qy)
+                                                                * weights_short_a[i].value*weights_short_b[j].value
+                                                                * weights_long_c[k].value;
+
                                                         if (weights_parallel_theta.size()>1) {
                                                                 _ptvalue *= sin(weights_parallel_theta[l].value);
                                                         }
                                                         sum += _ptvalue;
+                                                        //Find average volume
+                                                        vol += weights_short_a[i].weight
+                                                                * weights_short_b[j].weight
+                                                                * weights_long_c[k].weight
+                                                                * weights_short_a[i].value*weights_short_b[j].value
+                                                                * weights_long_c[k].value;
+                                                        //Find norm for volume
+                                                        norm_vol += weights_short_a[i].weight
+                                                                * weights_short_b[j].weight
+                                                                * weights_long_c[k].weight;
 
                                                         norm += weights_short_a[i].weight
@@ -209 +236 @@
         // integration (see documentation).
         if (weights_parallel_theta.size()>1) norm = norm / asin(1.0);
+
+        if (vol != 0.0 && norm_vol != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm_vol);}
+
         return sum/norm + background();
 }