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

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

@@ -5 +5 @@
  * [DISP_PARAMS] = radius, length, cyl_theta, cyl_phi
    [DESCRIPTION] = <text>P(q,alpha)= scale/V*f(q)^(2)+bkg
-                                                f(q)= 2*(scatter_sld - solvent_sld)*V*sin(qLcos(alpha/2))/[qLcos(alpha/2)]*
-                                                J1(qRsin(alpha/2))/[qRsin(alpha)]
-                                                V: Volume of the cylinder
-                                                R: Radius of the cylinder
-                                                L: Length of the cylinder
-                                                J1: The bessel function
-                                                alpha: angle betweenthe axis of the cylinder and the q-vector
-                                                for 1D:the ouput is P(q)=scale/V*integral from pi/2 to zero of f(q)^(2)*
-                                                sin(alpha)*dalpha+ bkg
+                                f(q)= 2*(scatter_sld - solvent_sld)*V
+                                *sin(qLcos(alpha/2))/[qLcos(alpha/2)]
+                                *J1(qRsin(alpha/2))/[qRsin(alpha)]
+                                V: Volume of the cylinder
+                                R: Radius of the cylinder
+                                L: Length of the cylinder
+                                J1: The bessel function
+                                alpha: angle betweenthe axis of the cylinder
+                                and the q-vector for 1D:the ouput is
+                                P(q)=scale/V*integral from pi/2 to zero of
+                                f(q)^(2)*sin(alpha)*dalpha+ bkg
                                         </text>
         [FIXED]= <text>cyl_phi.width; cyl_theta.width; length.width;radius.width</text>
         [ORIENTATION_PARAMS]= <text>cyl_phi; cyl_theta; cyl_phi.width; cyl_theta.width</text>
-        
+
 
  **/
@@ -24 +26 @@
     //  [DEFAULT]=scale=1.0
     double scale;
-    /// Radius of the cylinder [A]
-    //  [DEFAULT]=radius=20.0 A
+    /// Radius of the cylinder [Å]
+    //  [DEFAULT]=radius=20.0 [Å]
     double radius;
-    /// Length of the cylinder [A]
-    //  [DEFAULT]=length=400.0 A
+    /// Length of the cylinder [Å]
+    //  [DEFAULT]=length=400.0 [Å]
     double length;
-    /// Contrast [A-2]
-    //  [DEFAULT]=contrast=3.0e-6 A-2
+    /// Contrast [1/Ų]
+    //  [DEFAULT]=contrast=3.0e-6 [1/Ų]
     double contrast;
-        /// Incoherent Background (cm-1) 0.000
-        //  [DEFAULT]=background=0 cm-1
+        /// Incoherent Background [1/cm] 0.00
+        //  [DEFAULT]=background=0.0 [1/cm]
         double background;
     /// Orientation of the cylinder axis w/respect incoming beam [rad]
-    //  [DEFAULT]=cyl_theta=1.0 rad
+    //  [DEFAULT]=cyl_theta=1.0 [rad]
     double cyl_theta;
     /// Orientation of the cylinder in the plane of the detector [rad]
-    //  [DEFAULT]=cyl_phi=1.0 rad
+    //  [DEFAULT]=cyl_phi=1.0 [rad]
     double cyl_phi;
-        
+
 } CylinderParameters;