Changeset 0824909 in sasview for sansmodels/src/sans/models/CylinderModel.py

Timestamp:

Apr 15, 2009 7:59:36 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:

27c5c26

Parents:

b22748b

Message:

changed notation of units

File:

• sansmodels/src/sans/models/CylinderModel.py (modified) (2 diffs)

sansmodels/src/sans/models/CylinderModel.py

@@ -33 +33 @@
         List of default parameters:
          scale           = 1.0 
-         radius          = 20.0 A
-         length          = 400.0 A
-         contrast        = 3e-006 A-2
-         background      = 0.0 cm-1
-         cyl_theta       = 1.0 rad
-         cyl_phi         = 1.0 rad
+         radius          = 20.0 [Å]
+         length          = 400.0 [Å]
+         contrast        = 3e-006 [1/Ų]
+         background      = 0.0 [1/cm]
+         cyl_theta       = 1.0 [rad]
+         cyl_phi         = 1.0 [rad]
 
     """
@@ -53 +53 @@
         ## Model description
         self.description ="""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)]
+                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"""
+                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"""
        
                 ## Parameter details [units, min, max]
         self.details = {}
         self.details['scale'] = ['', None, None]
-        self.details['radius'] = ['A', None, None]
-        self.details['length'] = ['A', None, None]
-        self.details['contrast'] = ['A-2', None, None]
-        self.details['background'] = ['cm-1', None, None]
-        self.details['cyl_theta'] = ['rad', None, None]
-        self.details['cyl_phi'] = ['rad', None, None]
+        self.details['radius'] = ['[Å]', None, None]
+        self.details['length'] = ['[Å]', None, None]
+        self.details['contrast'] = ['[1/Ų]', None, None]
+        self.details['background'] = ['[1/cm]', None, None]
+        self.details['cyl_theta'] = ['[rad]', None, None]
+        self.details['cyl_phi'] = ['[rad]', None, None]
 
                 ## fittable parameters