Changeset 5eb9154 in sasview for sansmodels/src/sans/models/c_models/StickyHS.cpp

Timestamp:

Aug 31, 2009 5:25:44 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:

5be36bb

Parents:

572beba

Message:

calculation of the effective radius are added

File:

• sansmodels/src/sans/models/c_models/StickyHS.cpp (modified) (7 diffs)

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

@@ -33 +33 @@
 
 StickyHSStructure :: StickyHSStructure() {
-        radius      = Parameter(50.0, true);
-        radius.set_min(0.0);
+        effect_radius      = Parameter(50.0, true);
+        effect_radius.set_min(0.0);
         volfraction = Parameter(0.10, true);
         volfraction.set_min(0.0);
         perturb = Parameter(0.05, true);
         perturb.set_min(0.0);
-        stickiness = Parameter(0.20, true);;    
+        stickiness = Parameter(0.20, true);;
         stickiness.set_min(0.0);
 }
@@ -54 +54 @@
         // Fill parameter array for IGOR library
         // Add the background after averaging
-        dp[0] = radius();
+        dp[0] = effect_radius();
         dp[1] = volfraction();
         dp[2] = perturb();
@@ -61 +61 @@
         // Get the dispersion points for the radius
         vector<WeightPoint> weights_rad;
-        radius.get_weights(weights_rad);
+        effect_radius.get_weights(weights_rad);
 
         // Perform the computation, with all weight points
@@ -87 +87 @@
         StickyHSParameters dp;
         // Fill parameter array
-        dp.radius      = radius();
+        dp.effect_radius      = effect_radius();
         dp.volfraction = volfraction();
         dp.perturb = perturb();
@@ -94 +94 @@
         // Get the dispersion points for the radius
         vector<WeightPoint> weights_rad;
-        radius.get_weights(weights_rad);
+        effect_radius.get_weights(weights_rad);
 
         // Perform the computation, with all weight points
@@ -102 +102 @@
         // Loop over radius weight points
         for(int i=0; i<weights_rad.size(); i++) {
-                dp.radius = weights_rad[i].value;
+                dp.effect_radius = weights_rad[i].value;
 
                                         double _ptvalue = weights_rad[i].weight
@@ -128 +128 @@
         return (*this).operator()(qx, qy);
 }
+/**
+ * Function to calculate effective radius
+ * @param pars: parameters of the sphere
+ * @return: effective radius value
+ */
+double StickyHSStructure :: calculate_ER() {
+//NOT implemented yet!!!
+}