Changeset f10063e in sasview for sansmodels/src/sans/models/c_extensions/parallelepiped.c

Timestamp:

Mar 30, 2010 5: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_extensions/parallelepiped.c (modified) (3 diffs)

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

@@ -18 +18 @@
  */
 double parallelepiped_analytical_1D(ParallelepipedParameters *pars, double q) {
-        double dp[6];
+        double dp[7];
 
         // Fill paramater array
@@ -25 +25 @@
         dp[2] = pars->short_b;
         dp[3] = pars->long_c;
-        dp[4] = pars->contrast;
-        dp[5] = pars->background;
+        dp[4] = pars->sldPipe;
+        dp[5] = pars->sldSolv;
+        dp[6] = pars->background;
 
         // Call library function to evaluate model
@@ -149 +150 @@
 
         // Multiply by contrast^2
-        answer *= pars->contrast*pars->contrast;
+        answer *= (pars->sldPipe - pars->sldSolv) * (pars->sldPipe - pars->sldSolv);
 
         //normalize by cylinder volume