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

Timestamp:

Jan 7, 2010 3: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/spheroid.cpp (modified) (6 diffs)

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

@@ -91 +91 @@
         double sum = 0.0;
         double norm = 0.0;
+        double vol = 0.0;
 
         // Loop over major core weight points
@@ -107 +108 @@
                                 for(int l=0; l<(int)weights_polar_shell.size(); l++) {
                                         dp[4] = weights_polar_shell[l].value;
-
+                                        //Un-normalize  by volume
                                         sum += weights_equat_core[i].weight* weights_polar_core[j].weight * weights_equat_shell[k].weight
-                                                * weights_polar_shell[l].weight * ProlateForm(dp, q);
+                                                * weights_polar_shell[l].weight * ProlateForm(dp, q)
+                                                * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value;
+                                        //Find average volume
+                                        vol += weights_equat_core[i].weight* weights_polar_core[j].weight
+                                                * weights_equat_shell[k].weight
+                                                * weights_polar_shell[l].weight
+                                                * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value;
                                         norm += weights_equat_core[i].weight* weights_polar_core[j].weight * weights_equat_shell[k].weight
                                                         * weights_polar_shell[l].weight;
@@ -116 +123 @@
                 }
         }
+        if (vol != 0.0 && norm != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm);}
         return sum/norm + background();
 }
@@ -194 +204 @@
         double sum = 0.0;
         double norm = 0.0;
+        double norm_vol = 0.0;
+        double vol = 0.0;
 
         // Loop over major core weight points
@@ -218 +230 @@
                                                 for(int n=0; n< (int)weights_phi.size(); n++) {
                                                         dp.axis_phi = weights_phi[n].value;
-
+                                                        //Un-normalize by volume
                                                         double _ptvalue = weights_equat_core[i].weight *weights_polar_core[j].weight
                                                                 * weights_equat_shell[k].weight * weights_polar_shell[l].weight
                                                                 * weights_theta[m].weight
                                                                 * weights_phi[n].weight
-                                                                * spheroid_analytical_2DXY(&dp, qx, qy);
+                                                                * spheroid_analytical_2DXY(&dp, qx, qy)
+                                                                * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value;
                                                         if (weights_theta.size()>1) {
                                                                 _ptvalue *= sin(weights_theta[m].value);
                                                         }
                                                         sum += _ptvalue;
+                                                        //Find average volume
+                                                        vol += weights_equat_shell[k].weight
+                                                                * weights_polar_shell[l].weight
+                                                                * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value;
+                                                        //Find norm for volume
+                                                        norm_vol += weights_equat_shell[k].weight
+                                                                * weights_polar_shell[l].weight;
 
                                                         norm += weights_equat_core[i].weight *weights_polar_core[j].weight
@@ -242 +262 @@
         // 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();
 }