Changeset 42f193a in sasview for sansmodels/src/sans/models/c_models/lamellar.cpp

Timestamp:

Aug 4, 2009 1:20:01 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:

8e91f01

Parents:

2cc633b

Message:

some corrections on dips-parameters and adding 2D cal

File:

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

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

@@ -34 +34 @@
 LamellarModel :: LamellarModel() {
         scale      = Parameter(1.0);
-        delta     = Parameter(50.0, true);
+        delta     = Parameter(50.0);
         delta.set_min(0.0);
-        sigma    = Parameter(0.15, true);
+        sigma    = Parameter(0.15);
+        sigma.set_min(0.0);
         contrast   = Parameter(5.3e-6);
         background = Parameter(0.0);
@@ -59 +60 @@
         dp[4] = background();
 
-
-        // Get the dispersion points for the bilayer thickness(delta)
-        vector<WeightPoint> weights_delta;
-        delta.get_weights(weights_delta);
-
-        // Perform the computation, with all weight points
-        double sum = 0.0;
-        double norm = 0.0;
-
-        // Loop over semi axis A weight points
-        for(int i=0; i< (int)weights_delta.size(); i++) {
-                dp[1] = weights_delta[i].value;
-                sum += weights_delta[i].weight* LamellarFF(dp, q);
-                norm += weights_delta[i].weight;
-                                
-        }
-        return sum/norm + background();
+        return LamellarFF(dp, q);
 }
 
@@ -86 +71 @@
 
 double LamellarModel :: operator()(double qx, double qy) {
-        LamellarParameters dp;
-
-        // Fill parameter array for IGOR library
-        // Add the background after averaging
-        dp.scale = scale();
-        dp.delta = delta();
-        dp.sigma = sigma();
-        dp.contrast = contrast();
-        dp.background = background();
-
-
-        // Get the dispersion points for the bilayer thickness(delta)
-        vector<WeightPoint> weights_delta;
-        delta.get_weights(weights_delta);
-
-        // Perform the computation, with all weight points
-        double sum = 0.0;
-        double norm = 0.0;
-
-        // Loop over detla  weight points
-        for(int i=0; i< (int)weights_delta.size(); i++) {
-                dp.delta = weights_delta[i].value;
-                sum += weights_delta[i].weight* lamellar_analytical_2DXY(&dp, qx, qy);
-                norm += weights_delta[i].weight;
-                                
-        }
-        return sum/norm + background();
+        double q = sqrt(qx*qx + qy*qy);
+        return (*this).operator()(q);
 }
 
@@ -123 +83 @@
  */
 double LamellarModel :: evaluate_rphi(double q, double phi) {
-        double qx = q*cos(phi);
-        double qy = q*sin(phi);
-        return (*this).operator()(qx, qy);
+        return (*this).operator()(q);
 }