Changeset c1c29b6 in sasview for sansmodels/src/sans/models/c_models/lamellarPS.cpp

Timestamp:

Aug 21, 2009 12:34:33 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:

14c3887

Parents:

bda194e3

Message:

some corrections and removed polydispersity from inside of function and set dQ =0

File:

• sansmodels/src/sans/models/c_models/lamellarPS.cpp (modified) (5 diffs)

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

@@ -39 +39 @@
         delta     = Parameter(30.0);
         delta.set_min(0.0);
-        sigma    = Parameter(0.15);
-        sigma.set_min(0.0);
         contrast   = Parameter(5.3e-6);
         n_plates     = Parameter(20.0);
@@ -55 +53 @@
  */
 double LamellarPSModel :: operator()(double q) {
-        double dp[8];
+        double dp[7];
 
         // Fill parameter array for IGOR library
@@ -62 +60 @@
         dp[1] = spacing();
         dp[2] = delta();
-        dp[3] = sigma();
-        dp[4] = contrast();
-        dp[5] = n_plates();
-        dp[6] = caille();
-        dp[7] = 0.0;
+        dp[3] = contrast();
+        dp[4] = n_plates();
+        dp[5] = caille();
+        dp[6] = 0.0;
 
 
-        // Get the dispersion points for (delta) thickness
+        // Get the dispersion points for spacing and delta (thickness)
         vector<WeightPoint> weights_spacing;
         spacing.get_weights(weights_spacing);
+        vector<WeightPoint> weights_delta;
+        delta.get_weights(weights_delta);
 
         // Perform the computation, with all weight points
@@ -80 +79 @@
         for(int i=0; i< (int)weights_spacing.size(); i++) {
                 dp[1] = weights_spacing[i].value;
+                for(int j=0; j< (int)weights_spacing.size(); j++) {
+                        dp[2] = weights_delta[i].value;
 
-                sum += weights_spacing[i].weight * LamellarPS(dp, q);
-                norm += weights_spacing[i].weight;
-
+                        sum += weights_spacing[i].weight * weights_delta[j].weight * LamellarPS_kernel(dp, q);
+                        norm += weights_spacing[i].weight * weights_delta[j].weight;
+                }
         }
         return sum/norm + background();
@@ -108 +109 @@
         return (*this).operator()(q);
 }
+