Changeset 96b59384 in sasview for sansmodels/src/sans/models/c_extensions/oblate.h

Timestamp:

Aug 4, 2009 4:02:28 PM (15 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:

8dc0b746

Parents:

b341b16

Message:

added 2D and model descpt.

File:

• sansmodels/src/sans/models/c_extensions/oblate.h (modified) (4 diffs)

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

@@ -3 +3 @@
 /** Structure definition for oblate parameters
  * [PYTHONCLASS] = OblateModel
- * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell, axis_theta, axis_phi
-   [DESCRIPTION] = <text> Calculates the form factor for an oblate ellipsoid particle with a core/shell structure.
-                        Note:It is the users' responsibility to ensure that shell radii are larger than core radii, and
-                                        that major radii are larger than minor radii.</text>
+ * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell
+   [DESCRIPTION] = <text>[OblateCoreShellModel] Calculates the form factor for an oblate
+                        ellipsoid particle with a core_shell structure.
+                        The form factor is averaged over all possible
+                        orientations of the ellipsoid such that P(q)
+                        = scale*<f^2>/Vol + bkg, where f is the
+                        single particle scattering amplitude.
+                        [Parameters]:
+                        major_core = radius of major_core,
+                        minor_core = radius of minor_core,
+                        major_shell = radius of major_shell,
+                        minor_shell = radius of minor_shell,
+                        contrast = SLD_core - SLD_shell
+                        sld_solvent = SLD_solvent
+                        background = Incoherent bkg
+                        scale =scale
+                        Note:It is the users' responsibility to ensure
+                        that shell radii are larger than core radii.
+                        </text>
 
-   [FIXED] = <text>axis_phi.width; axis_theta.width; major_core.width;minor_core.width; major_shell; minor_shell</text>
-   [ORIENTATION_PARAMS] = <text>axis_phi; axis_theta; axis_phi.width; axis_theta.width</text>
+   [FIXED] = <text>major_core.width;minor_core.width; major_shell.width; minor_shell.width</text>
+   [ORIENTATION_PARAMS] =
 
  **/
@@ -37 +52 @@
         //  [DEFAULT]=background=0.001 [1/cm]
         double background;
+        /*//Disable for now
     /// Orientation of the oblate axis w/respect incoming beam [rad]
     //  [DEFAULT]=axis_theta=1.0 [rad]
@@ -43 +59 @@
     //  [DEFAULT]=axis_phi=1.0 [rad]
     double axis_phi;
-
+        */
 } OblateParameters;
 
@@ -54 +70 @@
 double oblate_analytical_2D(OblateParameters *pars, double q, double phi);
 double oblate_analytical_2DXY(OblateParameters *pars, double qx, double qy);
-double oblate_analytical_2D_scaled(OblateParameters *pars, double q, double q_x, double q_y);
+//double oblate_analytical_2D_scaled(OblateParameters *pars, double q, double q_x, double q_y);
 
 #endif