Changeset 42f193a in sasview for sansmodels/src/sans/models/c_models/vesicle.cpp

Timestamp:

Aug 4, 2009 11:20:01 AM (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:

8e91f01

Parents:

2cc633b

Message:

some corrections on dips-parameters and adding 2D cal

File:

• sansmodels/src/sans/models/c_models/vesicle.cpp (modified) (3 diffs)

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

@@ -34 +34 @@
         core_radius     = Parameter(100.0, true);
         core_radius.set_min(0.0);
-        thickness  = Parameter(30.0);
+        thickness  = Parameter(30.0, true);
+        thickness.set_min(0.0);
         core_sld   = Parameter(6.36e-6);
         shell_sld   = Parameter(5.0e-7);
@@ -57 +58 @@
         dp[4] = shell_sld();
         dp[5] = background();
-        
+
 
         // Get the dispersion points for the core radius
         vector<WeightPoint> weights_core_radius;
         core_radius.get_weights(weights_core_radius);
+        // Get the dispersion points for the thickness
+        vector<WeightPoint> weights_thickness;
+        thickness.get_weights(weights_thickness);
 
         // Perform the computation, with all weight points
@@ -70 +74 @@
         for(int i=0; i< (int)weights_core_radius.size(); i++) {
                 dp[1] = weights_core_radius[i].value;
-
-                sum += weights_core_radius[i].weight
-                        * VesicleForm(dp, q);
-                norm += weights_core_radius[i].weight;
+                for(int j=0; j< (int)weights_core_radius.size(); j++) {
+                        dp[2] = weights_thickness[j].value;
+                        sum += weights_core_radius[i].weight
+                                * weights_thickness[j].weight * VesicleForm(dp, q);
+                        norm += weights_core_radius[i].weight * weights_thickness[j].weight;
+                }
         }
         return sum/norm + background();