Changeset e08bd5b in sasview for sansmodels/src/c_models/hollowcylinder.cpp

Timestamp:

Feb 29, 2012 8:48:08 AM (13 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:

2d6f1f1

Parents:

6319646

Message:

c models fix: scale fix for P*S

File:

• sansmodels/src/c_models/hollowcylinder.cpp (modified) (1 diff)

sansmodels/src/c_models/hollowcylinder.cpp

@@ -372 +372 @@
   return rad_out;
 }
+/**
+ * Function to calculate volf_ratio for shell
+ * @return: volf_ratio value
+ */
+double HollowCylinderModel :: calculate_VR() {
+  HollowCylinderParameters dp;
+  dp.core_radius = core_radius();
+  dp.radius  = radius();
+  dp.length  = length();
+
+  double rad_out = 0.0;
+
+  // Perform the computation, with all weight points
+  double sum_tot = 0.0;
+  double sum_shell = 0.0;
+
+  // Get the dispersion points for the major shell
+  vector<WeightPoint> weights_length;
+  length.get_weights(weights_length);
+
+  // Get the dispersion points for the minor shell
+  vector<WeightPoint> weights_radius ;
+  radius.get_weights(weights_radius);
+
+  // Get the dispersion points for the core radius
+  vector<WeightPoint> weights_core_radius;
+  core_radius.get_weights(weights_core_radius);
+
+  // Loop over major shell weight points
+  for(int i=0; i< (int)weights_length.size(); i++) {
+    dp.length = weights_length[i].value;
+    for(int k=0; k< (int)weights_radius.size(); k++) {
+      dp.radius = weights_radius[k].value;
+      for(int j=0; j<(int)weights_core_radius.size(); j++) {
+          dp.core_radius = weights_core_radius[j].value;
+                  sum_tot +=weights_length[i].weight* weights_core_radius[j].weight
+                          * weights_radius[k].weight*pow(dp.radius, 2);
+                  sum_shell += weights_length[i].weight* weights_core_radius[j].weight
+                          * weights_radius[k].weight*(pow(dp.radius, 2)-pow(dp.core_radius, 2));
+      }
+    }
+  }
+    if (sum_tot == 0.0){
+      //return the default value
+      rad_out =  1.0;}
+    else{
+      //return ratio value
+      return sum_shell/sum_tot;
+    }
+}