Changeset f10063e in sasview for sansmodels/src/sans/models/c_models/spheroid.cpp

Timestamp:

Mar 30, 2010 7:56:04 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:

8d97277

Parents:

6e93a02

Message:

Updated the definition of SLD params according to new libigor functions

File:

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

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

@@ -43 +43 @@
         polar_shell    = Parameter(30.0, true);
         polar_shell.set_min(0.0);
-        contrast   = Parameter(1e-6);
+        sld_core   = Parameter(2e-6);
+        sld_shell  = Parameter(1e-6);
         sld_solvent = Parameter(6.3e-6);
         background = Parameter(0.0);
@@ -58 +59 @@
  */
 double CoreShellEllipsoidModel :: operator()(double q) {
-        double dp[8];
+        double dp[9];
 
         // Fill parameter array for IGOR library
@@ -67 +68 @@
         dp[3] = equat_shell();
         dp[4] = polar_shell();
-        dp[5] = contrast();
-        dp[6] = sld_solvent();
-        dp[7] = 0.0;
+        dp[5] = sld_core();
+        dp[6] = sld_shell();
+        dp[7] = sld_solvent();
+        dp[8] = 0.0;
 
         // Get the dispersion points for the major core
@@ -110 +112 @@
                                         //Un-normalize  by volume
                                         sum += weights_equat_core[i].weight* weights_polar_core[j].weight * weights_equat_shell[k].weight
-                                                * weights_polar_shell[l].weight * ProlateForm(dp, q)
+                                                * weights_polar_shell[l].weight * OblateForm(dp, q)
                                                 * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value;
                                         //Find average volume
@@ -170 +172 @@
         dp.equat_shell = equat_shell();
         dp.polar_shell = polar_shell();
-        dp.contrast = contrast();
+        dp.sld_core = sld_core();
+        dp.sld_shell = sld_shell();
         dp.sld_solvent = sld_solvent();
         dp.background = 0.0;