Changeset 13eb1c4 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Apr 15, 2010 6:41:29 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:

8426622

Parents:

2339249f

Message:

updated sld parameters according to the changes in NIST lib: missed it in the last commit

Location:

sansmodels/src/sans/models/c_extensions

Files:

• triaxial_ellipsoid.c (modified) (3 diffs)
• triaxial_ellipsoid.h (modified) (1 diff)

sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.c

@@ -18 +18 @@
  */
 double triaxial_ellipsoid_analytical_1D(TriaxialEllipsoidParameters *pars, double q) {
-        double dp[6];
+        double dp[7];
 
         // Fill paramater array
@@ -25 +25 @@
         dp[2] = pars->semi_axisB;
         dp[3] = pars->semi_axisC;
-        dp[4] = pars->contrast;
-        dp[5] = pars->background;
+        dp[4] = pars->sldEll;
+        dp[5] = pars->sldSolv;
+        dp[6] = pars->background;
 
         // Call library function to evaluate model
@@ -133 +134 @@
 
         // Multiply by contrast^2
-        answer *= pars->contrast*pars->contrast;
+        answer *= (pars->sldEll- pars->sldSolv)*(pars->sldEll- pars->sldSolv);
 
         //normalize by cylinder volume

sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.h

@@ -24 +24 @@
     //  [DEFAULT]=semi_axisC=400.0 [A]
     double semi_axisC;
-    /// Contrast [1/A^(2)]
-    //  [DEFAULT]=contrast=5.3e-6 [1/A^(2)]
-    double contrast;
+    /// sldEll [1/A^(2)]
+    //  [DEFAULT]=sldEll=1.0e-6 [1/A^(2)]
+    double sldEll;
+    /// sldSolv [1/A^(2)]
+    //  [DEFAULT]=sldSolv=6.3e-6 [1/A^(2)]
+    double sldSolv;
         /// Incoherent Background [1/cm] 0.00
         //  [DEFAULT]=background=0.0 [1/cm]