Changeset 70faf5d in sasview for sansmodels/src/sans/models/c_extensions/core_shell_cylinder.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/core_shell_cylinder.h (modified) (2 diffs)

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

@@ -8 +8 @@
  //[DISP_PARAMS] = radius, thickness, length, axis_theta, axis_phi
  //[DESCRIPTION] = <text>P(q,alpha)= scale/Vs*f(q)^(2) + bkg  Where:\n\
- //                                              f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\
- //                                             [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n 2(shell_sld-solvent_sld)*Vs
- //                                             *sin[q(L+T)cos(alpha/2)]/[[q(L+T)cos(alpha/2)]
- //                                             *J1(q(R+T)sin(alpha))/q(R+T)sin(alpha)]
- //                                             alpha:is the angle between the axis of the cylinder and the q-vector
- //                                             Vs: the volume of the outer shell
- //                                             Vc: the volume of the core
- //                                             L: the length of the core
- //                                     shell_sld: the scattering length density of the shell
- //                                             solvent_sld: the scattering length density of the solvent
- //                                             bkg: the background
- //                                             T: the thickness
- //                                     R+T: is the outer radius
- //                                     L+2T: The total length of the outershell
- //                                             J1: the first order Bessel function
- //                                     theta: axis_theta of the cylinder
- //                                     phi: the axis_phi of the cylinder
- //                                     </text>
+ //      f(q)= 2(core_sld- solvant_sld)* Vc*sin[qLcos(alpha/2)]/\n\
+ //      [qLcos(alpha/2)]*J1(qRsin(alpha))/[qRsin(alpha)] +\n
+ //  2(shell_sld-solvent_sld)*Vs
+ //      *sin[q(L+T)cos(alpha/2)]/[[q(L+T)cos(alpha/2)]
+ //      *J1(q(R+T)sin(alpha))/q(R+T)sin(alpha)]
+ //                     alpha:is the angle between the axis of the cylinder
+ //          and the q-vector
+ //                     Vs: the volume of the outer shell
+ //                     Vc: the volume of the core
+ //                     L: the length of the core
+ //             shell_sld: the scattering length density of the shell
+ //                     solvent_sld: the scattering length density of the solvent
+ //                     bkg: the background
+ //                     T: the thickness
+ //             R+T: is the outer radius
+ //             L+2T: The total length of the outershell
+ //                     J1: the first order Bessel function
+ //             theta: axis_theta of the cylinder
+ //             phi: the axis_phi of the cylinder
+ //             </text>
  //[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; thickness_width</text>
- //[ORIENTATION_PARAMS]= axis_phi; axis_theta;axis_phi.width; axis_theta.width 
+ //[ORIENTATION_PARAMS]= axis_phi; axis_theta;axis_phi.width; axis_theta.width
 
 
@@ -35 +37 @@
     double scale;
 
-    /// Core radius [A]
-    //  [DEFAULT]=radius=20.0 A
+    /// Core radius [Å]
+    //  [DEFAULT]=radius=20.0 [Å]
     double radius;
 
-    /// Shell thickness [A]
-    //  [DEFAULT]=thickness=10.0 A
+    /// Shell thickness [Å]
+    //  [DEFAULT]=thickness=10.0 [Å]
     double thickness;
 
-    /// Core length [A]
-    //  [DEFAULT]=length=400.0 A
+    /// Core length [Å]
+    //  [DEFAULT]=length=400.0 [Å]
     double length;
 
-    /// Core SLD [A-2]
-    //  [DEFAULT]=core_sld=1.0e-6 A-2
+    /// Core SLD [1/Ų]
+    //  [DEFAULT]=core_sld=1.0e-6 [1/Ų]
     double core_sld;
 
-    /// Shell SLD [A-2]
-    //  [DEFAULT]=shell_sld=4.0e-6 A-2
+    /// Shell SLD [1/Ų]
+    //  [DEFAULT]=shell_sld=4.0e-6 [1/Ų]
     double shell_sld;
 
-    /// Solvent SLD [A-2]
-    //  [DEFAULT]=solvent_sld=1.0e-6 A-2
+    /// Solvent SLD [1/Ų]
+    //  [DEFAULT]=solvent_sld=1.0e-6 [1/Ų]
     double solvent_sld;
 
-        /// 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 core-shell cylinder 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 core-shell cylinder in the plane of the detector [rad]
-    //  [DEFAULT]=axis_phi=0.0 rad
+    //  [DEFAULT]=axis_phi=0.0 [rad]
     double axis_phi;