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

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

@@ -80 +80 @@
         double sum = 0.0;
         double norm = 0.0;
+        double vol = 0.0;
 
         // Loop over radius weight points
@@ -88 +89 @@
                         for(int k=0; k< (int)weights_w_thickness.size(); k++){
                                 dp[3] = weights_w_thickness[k].value;
-
+                                //Un-normalize SphereForm by volume
                                 sum += weights_core_radius[i].weight*weights_s_thickness[j].weight
-                                        *weights_w_thickness[k].weight* MultiShell(dp, q);
+                                        *weights_w_thickness[k].weight* MultiShell(dp, q)
+                                        *pow(weights_core_radius[i].value+dp[6]*weights_s_thickness[j].value+(dp[6]-1)*weights_w_thickness[k].value,3);
+                                //Find average volume
+                                vol += weights_core_radius[i].weight*weights_s_thickness[j].weight
+                                        *weights_w_thickness[k].weight
+                                        *pow(weights_core_radius[i].value+dp[6]*weights_s_thickness[j].value+(dp[6]-1)*weights_w_thickness[k].value,3);
                                 norm += weights_core_radius[i].weight*weights_s_thickness[j].weight
                                         *weights_w_thickness[k].weight;
@@ -96 +102 @@
                 }
         }
+        if (vol != 0.0 && norm != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm);}
         return sum/norm + background();
 }