Changeset 70faf5d in sasview for sansmodels/src/sans/models/c_extensions/ellipsoid.h

Timestamp:

Apr 15, 2009 9:58:33 AM (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:

b22748b

Parents:

179a411

Message:

changed notation of units

File:

• sansmodels/src/sans/models/c_extensions/ellipsoid.h (modified) (2 diffs)

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

@@ -9 +9 @@
  //[PYTHONCLASS] = EllipsoidModel
  //[DISP_PARAMS] = radius_a, radius_b, axis_theta, axis_phi
- //[DESCRIPTION] = <text>"P(q.alpha)= scale*f(q)^(2)+ bkg\n\
- //                                     f(q)= 3*(scatter_sld- scatter_solvent)*V*[sin(q*r(Ra,Rb,alpha)) - q*r*cos(qr(Ra,Rb,alpha))]
- //                                                     /[qr(Ra,Rb,alpha)]^(3)"
- //                                             r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2) + Ra^(2)*(cos(alpha))^(2)]^(1/2)
- //                                             scatter_sld: scattering length density of the scatter
- //                                             solvent_sld: scattering length density of the solvent
- //                                             V: volune of the Eliipsoid
- //                                             Ra: radius along the rotation axis of the Ellipsoid
- //                                             Rb: radius perpendicular to the rotation axis of the ellipsoid
- //                                             </text>
+ //[DESCRIPTION] = <text>"P(q.alpha)= scale*f(q)^(2)+ bkg
+ //             f(q)= 3*(scatter_sld- scatter_solvent)*V
+ //                     *[sin(q*r(Ra,Rb,alpha))- q*r*cos(qr(Ra,Rb,alpha))]
+ //             /[qr(Ra,Rb,alpha)]^(3)"
+ //     r(Ra,Rb,alpha)= [Rb^(2)*(sin(alpha))^(2)
+ //     + Ra^(2)*(cos(alpha))^(2)]^(1/2)
+ //             scatter_sld: scattering length density of the scatter
+ //             solvent_sld: scattering length density of the solvent
+ //             V: volune of the Eliipsoid
+ //             Ra: radius along the rotation axis of the Ellipsoid
+ //             Rb: radius perpendicular to the rotation axis of the ellipsoid
+ //             </text>
  //[FIXED]= <text> axis_phi.width; axis_theta.width;radius_a.width;
  //radius_b.width; length.width; r_minor.width
@@ -30 +32 @@
     double scale;
 
-    /// Rotation axis radius_a [A]
-    //  [DEFAULT]=radius_a=20.0 A
+    /// Rotation axis radius_a [Å]
+    //  [DEFAULT]=radius_a=20.0 [Å]
     double radius_a;
 
-    /// Radius_b [A]
-    //  [DEFAULT]=radius_b=400 A
+    /// Radius_b [Å]
+    //  [DEFAULT]=radius_b=400 [Å]
     double radius_b;
 
-    /// Contrast [Å-2]
-    //  [DEFAULT]=contrast=3.0e-6 A-2
+    /// Contrast [1/Ų]
+    //  [DEFAULT]=contrast=3.0e-6 [1/Ų]
     double contrast;
 
-        /// Incoherent Background [cm-1]
-        //  [DEFAULT]=background=0 cm-1
+        /// Incoherent Background [1/cm]
+        //  [DEFAULT]=background=0 [1/cm]
         double background;
 
     /// Orientation of the long axis of the ellipsoid w/respect incoming beam [rad]
-    //  [DEFAULT]=axis_theta=1.57 rad
+    //  [DEFAULT]=axis_theta=1.57 [rad]
     double axis_theta;
     /// Orientation of the long axis of the ellipsoid in the plane of the detector [rad]
-    //  [DEFAULT]=axis_phi=0.0 rad
+    //  [DEFAULT]=axis_phi=0.0 [rad]
     double axis_phi;
 } EllipsoidParameters;