Changeset ea07075 in sasview for sansmodels/src/sans/models/c_models/flexiblecylinder.cpp

Timestamp:

Aug 3, 2009 5:41:22 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:

e6fa43e

Parents:

2a1be2d9

Message:

done corrections and 2d extension on this model function

File:

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

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

@@ -19 +19 @@
  *
  *      TODO: refactor so that we pull in the old sansmodels.c_extensions
- *      TODO: add 2d 
+ *      TODO: add 2d
  */
 
@@ -43 +43 @@
         contrast   = Parameter(5.3e-6);
         background = Parameter(0.0001);
-        axis_theta  = Parameter(0.0, true);
-        axis_phi    = Parameter(0.0, true);
 }
 
@@ -101 +99 @@
  */
 double FlexibleCylinderModel :: operator()(double qx, double qy) {
-        FlexibleCylinderParameters dp;
-        // Fill parameter array
-        dp.scale      = scale();
-        dp.length     = length();
-        dp.kuhn_length= kuhn_length();
-        dp.radius     = radius();
-        dp.contrast   = contrast();
-        dp.background = background();
-        dp.axis_theta  = axis_theta();
-        dp.axis_phi    = axis_phi();
-
-        // Get the dispersion points for the length
-        vector<WeightPoint> weights_length;
-        length.get_weights(weights_length);
-
-        // Get the dispersion points for the radius
-        vector<WeightPoint> weights_radius;
-        radius.get_weights(weights_radius);
-
-        // Get angular averaging for theta
-        vector<WeightPoint> weights_theta;
-        axis_theta.get_weights(weights_theta);
-
-        // Get angular averaging for phi
-        vector<WeightPoint> weights_phi;
-        axis_phi.get_weights(weights_phi);
-
-        // Perform the computation, with all weight points
-        double sum = 0.0;
-        double norm = 0.0;
-
-        // Loop over length weight points
-        for(int i=0; i< (int)weights_length.size(); i++) {
-                dp.length = weights_length[i].value;
-
-                // Loop over radius weight points
-                for(int j=0; j< (int)weights_radius.size(); j++) {
-                        dp.radius = weights_radius[j].value;
-
-                                // Average over theta distribution
-                                for(int k=0; k< (int)weights_theta.size(); k++) {
-                                        dp.axis_theta = weights_theta[k].value;
-
-                                        // Average over phi distribution
-                                        for(int l=0; l <(int)weights_phi.size(); l++) {
-                                                dp.axis_phi = weights_phi[l].value;
-
-                                                double _ptvalue = weights_length[i].weight
-                                                        * weights_radius[j].weight
-                                                        * weights_theta[k].weight
-                                                        * weights_phi[l].weight
-                                                        * flexible_cylinder_analytical_2DXY(&dp, qx, qy);
-                                                if (weights_theta.size()>1) {
-                                                        _ptvalue *= sin(weights_theta[k].value);
-                                                }
-                                                sum += _ptvalue;
-
-                                                norm += weights_length[i].weight
-                                                        * weights_radius[j].weight
-                                                        * weights_theta[k].weight
-                                                        * weights_phi[l].weight;
-                                }
-                        }
-                }
-        }
-        // Averaging in theta needs an extra normalization
-        // factor to account for the sin(theta) term in the
-        // integration (see documentation).
-        if (weights_theta.size()>1) norm = norm / asin(1.0);
-        return sum/norm + background();
+        double q = sqrt(qx*qx + qy*qy);
+        return (*this).operator()(q);
 }
 
@@ -181 +111 @@
  */
 double FlexibleCylinderModel :: evaluate_rphi(double q, double phi) {
-        double qx = q*cos(phi);
-        double qy = q*sin(phi);
-        return (*this).operator()(qx, qy);
+        //double qx = q*cos(phi);
+        //double qy = q*sin(phi);
+        return (*this).operator()(q);
 }