Changeset c451be9 in sasview for sansmodels/src/sans/models/c_models/hollowcylinder.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/hollowcylinder.cpp (modified) (6 diffs)

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

@@ -78 +78 @@
         double sum = 0.0;
         double norm = 0.0;
+        double vol = 0.0;
 
         // Loop over core radius weight points
@@ -90 +91 @@
                         for(int k=0; k< (int)weights_radius.size(); k++) {
                                 dp[2] = weights_radius[k].value;
-
+                                //Un-normalize  by volume
                                 sum += weights_core_radius[i].weight
                                         * weights_length[j].weight
                                         * weights_radius[k].weight
-                                        * HollowCylinder(dp, q);
+                                        * HollowCylinder(dp, q)
+                                        * (pow(weights_radius[k].value,2)-pow(weights_core_radius[i].value,2))
+                                        * weights_length[j].value;
+                                //Find average volume
+                                vol += weights_core_radius[i].weight
+                                        * weights_length[j].weight
+                                        * weights_radius[k].weight
+                                        * (pow(weights_radius[k].value,2)-pow(weights_core_radius[i].value,2))
+                                        * weights_length[j].value;
+
                                 norm += weights_core_radius[i].weight
-                                * weights_length[j].weight
-                                * weights_radius[k].weight;
+                                        * weights_length[j].weight
+                                        * weights_radius[k].weight;
                         }
                 }
         }
+        if (vol != 0.0 && norm != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm);}
+
         return sum/norm + background();
 }
@@ -145 +159 @@
         double sum = 0.0;
         double norm = 0.0;
+        double norm_vol = 0.0;
+        double vol = 0.0;
 
         // Loop over core radius weight points
@@ -166 +182 @@
                                 for(int l=0; l< (int)weights_phi.size(); l++) {
                                         dp.axis_phi = weights_phi[l].value;
-
+                                        //Un-normalize by volume
                                         double _ptvalue = weights_core_radius[i].weight
                                                 * weights_length[j].weight
@@ -172 +188 @@
                                                 * weights_theta[k].weight
                                                 * weights_phi[l].weight
-                                                * hollow_cylinder_analytical_2DXY(&dp, qx, qy);
+                                                * hollow_cylinder_analytical_2DXY(&dp, qx, qy)
+                                                * (pow(weights_radius[m].value,2)-pow(weights_core_radius[i].value,2))
+                                                * weights_length[j].value;
                                         if (weights_theta.size()>1) {
                                                 _ptvalue *= sin(weights_theta[k].value);
                                         }
                                         sum += _ptvalue;
+                                        //Find average volume
+                                        vol += weights_core_radius[i].weight
+                                                * weights_length[j].weight
+                                                * weights_radius[k].weight
+                                                * (pow(weights_radius[m].value,2)-pow(weights_core_radius[i].value,2))
+                                                * weights_length[j].value;
+                                        //Find norm for volume
+                                        norm_vol += weights_core_radius[i].weight
+                                                * weights_length[j].weight
+                                                * weights_radius[m].weight;
 
                                         norm += weights_core_radius[i].weight
@@ -193 +221 @@
         // integration (see documentation).
         if (weights_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();
 }