Changeset 15f52f8 in sasview for sansmodels/src

Timestamp:

Sep 14, 2009 4:13:10 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:

7ad9887

Parents:

7a5fa98

Message:

correction on the definition of total length

Location:

sansmodels/src/sans/models

Files:

• c_models/coreshellcylinder.cpp (modified) (3 diffs)
• test/utest_model_calculate_ER.py (modified) (1 diff)

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

@@ -230 +230 @@
         double norm = 0.0;
 
-        // Get the dispersion points for the major shell
+        // Get the dispersion points for the length
         vector<WeightPoint> weights_length;
         length.get_weights(weights_length);
 
-        // Get the dispersion points for the major shell
+        // Get the dispersion points for the thickness
         vector<WeightPoint> weights_thickness;
         thickness.get_weights(weights_thickness);
 
-        // Get the dispersion points for the minor shell
+        // Get the dispersion points for the radius
         vector<WeightPoint> weights_radius ;
         radius.get_weights(weights_radius);
@@ -249 +249 @@
                         for(int k=0; k< (int)weights_radius.size(); k++) {
                                 dp.radius = weights_radius[k].value;
-                                //Note: output of "DiamCyl(dp.length,dp.radius)" is DIAMETER.
+                                //Note: output of "DiamCyl( )" is DIAMETER.
                                 sum +=weights_length[i].weight * weights_thickness[j].weight
-                                        * weights_radius[k].weight*DiamCyl(dp.length,dp.radius+dp.thickness)/2.0;
+                                        * weights_radius[k].weight*DiamCyl(dp.length+2.0*dp.thickness,dp.radius+dp.thickness)/2.0;
                                 norm += weights_length[i].weight* weights_thickness[j].weight* weights_radius[k].weight;
                         }
@@ -261 +261 @@
         else{
                 //return normal value
-                //Note: output of "DiamCyl(dp.length,dp.radius)" is DIAMETER.
-                rad_out = DiamCyl(dp.length,dp.radius+dp.thickness)/2.0;}
+                //Note: output of "DiamCyl()" is DIAMETER.
+                rad_out = DiamCyl(dp.length+2.0*dp.thickness,dp.radius+dp.thickness)/2.0;}
 
         return rad_out;

sansmodels/src/sans/models/test/utest_model_calculate_ER.py

@@ -92 +92 @@
         self.comp.setParam("length",400)
         self.diam.setParam("radius", 30)
-        self.diam.setParam("length",400)       
+        self.diam.setParam("length",420)       
         self.assertAlmostEqual(self.comp.calculate_ER(), self.diam.run(0.1)/2)