Changeset e6fa43e in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Aug 3, 2009 6:14:16 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:

0f3fefe

Parents:

ea07075

Message:

more corrections on this model

File:

• sansmodels/src/sans/models/c_models/flexiblecylinder.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
         length.get_weights(weights_length);
 
+        // Get the dispersion points for the kuhn_length
+        vector<WeightPoint> weights_kuhn_length;
+        kuhn_length.get_weights(weights_kuhn_length);
+
         // Get the dispersion points for the radius
         vector<WeightPoint> weights_radius;
@@ -80 +84 @@
 
                 // Loop over semi axis B weight points
-                for(int j=0; j< (int)weights_radius.size(); j++) {
-                        dp[2] = weights_radius[j].value;
+                for(int j=0; j< (int)weights_kuhn_length.size(); j++) {
+                        dp[2] = weights_kuhn_length[j].value;
 
-                        sum += weights_length[i].weight
-                                * weights_radius[j].weight * FlexExclVolCyl(dp, q);
-                        norm += weights_length[i].weight
-                                        * weights_radius[j].weight;
+                        // Loop over semi axis C weight points
+                        for(int k=0; k< (int)weights_radius.size(); k++) {
+                                dp[3] = weights_radius[k].value;
+
+                                sum += weights_length[i].weight
+                                        * weights_kuhn_length[j].weight * weights_radius[k].weight * FlexExclVolCyl(dp, q);
+                                norm += weights_length[i].weight
+                                        * weights_kuhn_length[j]*weights_radius[k].weight;
                 }
         }