Changeset 0164899a in sasview for sansmodels/src/sans/models/c_models/refl.cpp

Timestamp:

Nov 1, 2010 4:22:12 PM (14 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:

4b3d25b

Parents:

6cda91f

Message:

new models and some bug fixes

File:

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

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

@@ -15 +15 @@
         thick_inter0 = Parameter(1.0);
         func_inter0 = Parameter(0);
-        sld_sub0 = Parameter(2.07e-06);
+        sld_bottom0 = Parameter(2.07e-06);
         sld_medium = Parameter(1.0e-06);
     background = Parameter(0.0);
@@ -67 +67 @@
     func_inter10 = Parameter(0);
 
-    sldIM_flat1 = Parameter(0);
-    sldIM_flat2 = Parameter(0);
-    sldIM_flat3 = Parameter(0);
-    sldIM_flat4 = Parameter(0);
-    sldIM_flat5 = Parameter(0);
-    sldIM_flat6 = Parameter(0);
-    sldIM_flat7 = Parameter(0);
-    sldIM_flat8 = Parameter(0);
-    sldIM_flat9 = Parameter(0);
-    sldIM_flat10 = Parameter(0);
-
-    sldIM_sub0 = Parameter(0);
-    sldIM_medium = Parameter(0);
 }
 
@@ -88 +75 @@
  */
 double ReflModel :: operator()(double q) {
-        double dp[59];
+        double dp[47];
         // Fill parameter array for IGOR library
         // Add the background after averaging
@@ -95 +82 @@
         dp[2] = thick_inter0();
         dp[3] = func_inter0();
-        dp[4] = sld_sub0();
+        dp[4] = sld_bottom0();
         dp[5] = sld_medium();
         dp[6] = background();
@@ -143 +130 @@
         dp[46] = func_inter10();
 
-        dp[47] = sldIM_flat1();
-        dp[48] = sldIM_flat2();
-        dp[49] = sldIM_flat3();
-        dp[50] = sldIM_flat4();
-        dp[51] = sldIM_flat5();
-        dp[52] = sldIM_flat6();
-        dp[53] = sldIM_flat7();
-        dp[54] = sldIM_flat8();
-        dp[55] = sldIM_flat9();
-        dp[56] = sldIM_flat10();
-
-        dp[57] = sldIM_sub0();
-        dp[58] = sldIM_medium();
-
         // Get the dispersion points for the radius
         //vector<WeightPoint> weights_thick;