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

Timestamp:

Apr 15, 2009 9: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/EllipsoidModel.py (modified) (3 diffs)

sansmodels/src/sans/models/EllipsoidModel.py

@@ -33 +33 @@
         List of default parameters:
          scale           = 1.0 
-         radius_a        = 20.0 A
-         radius_b        = 400.0 A
-         contrast        = 3e-006 A-2
-         background      = 0.0 cm-1
-         axis_theta      = 1.57 rad
-         axis_phi        = 0.0 rad
+         radius_a        = 20.0 [Å]
+         radius_b        = 400.0 [Å]
+         contrast        = 3e-006 [1/Ų]
+         background      = 0.0 [1/cm]
+         axis_theta      = 1.57 [rad]
+         axis_phi        = 0.0 [rad]
 
     """
@@ -52 +52 @@
         self.name = "EllipsoidModel"
         ## Model description
-        self.description =""""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))]
+        self.description =""""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)
+                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
@@ -65 +67 @@
         self.details = {}
         self.details['scale'] = ['', None, None]
-        self.details['radius_a'] = ['A', None, None]
-        self.details['radius_b'] = ['A', None, None]
-        self.details['contrast'] = ['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_a'] = ['[Å]', None, None]
+        self.details['radius_b'] = ['[Å]', None, None]
+        self.details['contrast'] = ['[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