Changeset 0824909 in sasview for sansmodels/src/sans/models/CoreShellCylinderModel.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/CoreShellCylinderModel.py (modified) (3 diffs)

sansmodels/src/sans/models/CoreShellCylinderModel.py

@@ -33 +33 @@
         List of default parameters:
          scale           = 1.0 
-         radius          = 20.0 A
-         thickness       = 10.0 A
-         length          = 400.0 A
-         core_sld        = 1e-006 A-2
-         shell_sld       = 4e-006 A-2
-         solvent_sld     = 1e-006 A-2
-         background      = 0.0 cm-1
-         axis_theta      = 1.57 rad
-         axis_phi        = 0.0 rad
+         radius          = 20.0 [Å]
+         thickness       = 10.0 [Å]
+         length          = 400.0 [Å]
+         core_sld        = 1e-006 [1/Ų]
+         shell_sld       = 4e-006 [1/Ų]
+         solvent_sld     = 1e-006 [1/Ų]
+         background      = 0.0 [1/cm]
+         axis_theta      = 1.57 [rad]
+         axis_phi        = 0.0 [rad]
 
     """
@@ -57 +57 @@
         self.description ="""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
+                [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
+                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
@@ -77 +79 @@
         self.details = {}
         self.details['scale'] = ['', None, None]
-        self.details['radius'] = ['A', None, None]
-        self.details['thickness'] = ['A', None, None]
-        self.details['length'] = ['A', None, None]
-        self.details['core_sld'] = ['A-2', None, None]
-        self.details['shell_sld'] = ['A-2', None, None]
-        self.details['solvent_sld'] = ['A-2', None, None]
-        self.details['background'] = ['cm-1', None, None]
-        self.details['axis_theta'] = ['rad', None, None]
-        self.details['axis_phi'] = ['rad', None, None]
+        self.details['radius'] = ['[Å]', None, None]
+        self.details['thickness'] = ['[Å]', None, None]
+        self.details['length'] = ['[Å]', None, None]
+        self.details['core_sld'] = ['[1/Ų]', None, None]
+        self.details['shell_sld'] = ['[1/Ų]', None, None]
+        self.details['solvent_sld'] = ['[1/Ų]', None, None]
+        self.details['background'] = ['[1/cm]', None, None]
+        self.details['axis_theta'] = ['[rad]', None, None]
+        self.details['axis_phi'] = ['[rad]', None, None]
 
                 ## fittable parameters