Changeset f10063e in sasview for sansmodels/src/sans/models/c_extensions/sphere.h

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/sphere.h (modified) (2 diffs)

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

@@ -7 +7 @@
  //[PYTHONCLASS] = SphereModel
  //[DISP_PARAMS] = radius
- //[DESCRIPTION] =<text>P(q)=(scale/V)*[3V(scatter_sld-solvent_sld)*(sin(qR)-qRcos(qR))
+ //[DESCRIPTION] =<text>P(q)=(scale/V)*[3V(sldSph-sldSolv)*(sin(qR)-qRcos(qR))
  //                                             /(qR)^3]^(2)+bkg
  //
  //                             bkg:background, R: radius of sphere
  //                             V:The volume of the scatter
- //                             contrast:SLD difference between
- //                             scatter and solvent
- //                             scatter_sld: the SLD of the scatter
- //                             solvent_sld: the SLD of the solvent
+ //                             sldSph: the SLD of the sphere
+ //                             sldSolv: the SLD of the solvent
  //
  //             </text>
@@ -30 +28 @@
     double radius;
 
-    /// Contrast [1/A^(2)]
-    //  [DEFAULT]=contrast= 1.0e-6 [1/A^(2)]
-    double contrast;
+    /// sldSph [1/A^(2)]
+    //  [DEFAULT]=sldSph= 2.0e-6 [1/A^(2)]
+    double sldSph;
+
+    /// sldSolv [1/A^(2)]
+    //  [DEFAULT]=sldSolv= 1.0e-6 [1/A^(2)]
+    double sldSolv;
 
         /// Incoherent Background [1/cm]