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

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

@@ -75 +75 @@
         double sum = 0.0;
         double norm = 0.0;
+        double vol = 0.0;
 
         // Loop over radius weight points
@@ -83 +84 @@
                 for(int j=0; j<weights_thick.size(); j++) {
                         dp[2] = weights_thick[j].value;
+                        //Un-normalize SphereForm by volume
+                        sum += weights_rad[i].weight
+                                * weights_thick[j].weight * CoreShellForm(dp, q)* pow(weights_rad[i].value+weights_thick[j].value,3);
 
-                        sum += weights_rad[i].weight
-                                * weights_thick[j].weight * CoreShellForm(dp, q);
+                        //Find average volume
+                        vol += weights_rad[i].weight * weights_thick[j].weight
+                                * pow(weights_rad[i].value+weights_thick[j].value,3);
                         norm += weights_rad[i].weight
                                 * weights_thick[j].weight;
                 }
         }
+
+        if (vol != 0.0 && norm != 0.0) {
+                //Re-normalize by avg volume
+                sum = sum/(vol/norm);}
+
         return sum/norm + background();
 }