Changeset 2cb89e7 in sasview for sansmodels/src/sans/models/ParallelepipedModel.py

Timestamp:

Aug 16, 2009 12:30:27 PM (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:

7d11b81

Parents:

b0d0723

Message:

Changed the def. of lengths of sides for 2D,thus consistent w/ 1D. And shortened the names.

File:

• sansmodels/src/sans/models/ParallelepipedModel.py (modified) (4 diffs)

sansmodels/src/sans/models/ParallelepipedModel.py

@@ -33 +33 @@
         List of default parameters:
          scale           = 1.0 
-         short_edgeA     = 35.0 [A]
-         longer_edgeB    = 75.0 [A]
-         longuest_edgeC  = 400.0 [A]
+         short_a         = 35.0 [A]
+         long_b          = 75.0 [A]
+         longer_c        = 400.0 [A]
          contrast        = 5.3e-006 [1/A²]
          background      = 0.0 [1/cm]
@@ -54 +54 @@
         self.name = "ParallelepipedModel"
         ## Model description
-        self.description =""" Calculates the form factor for a rectangular solid with uniform scattering length density.
+        self.description =""" Form factor for a rectangular solid with uniform scattering length density.
                 
                 scale:Scale factor
-                short_edgeA: Shortest edge of the parallelepiped [A]
-                longer_edgeB: Longer edge of the parallelepiped [A]
-                longuest_edgeC: Longuest edge of the parallelepiped [A]
-                constrast: particle_sld - solvent_sld
+                short_a: length of short side of the parallelepiped [A]
+                long_b: length of long side of the parallelepiped [A]
+                longer_c: length of longer side of the parallelepiped [A]
+                contrast: particle_sld - solvent_sld
                 background:Incoherent Background [1/cm]"""
        
@@ -66 +66 @@
         self.details = {}
         self.details['scale'] = ['', None, None]
-        self.details['short_edgeA'] = ['[A]', None, None]
-        self.details['longer_edgeB'] = ['[A]', None, None]
-        self.details['longuest_edgeC'] = ['[A]', None, None]
+        self.details['short_a'] = ['[A]', None, None]
+        self.details['long_b'] = ['[A]', None, None]
+        self.details['longer_c'] = ['[A]', None, None]
         self.details['contrast'] = ['[1/A²]', None, None]
         self.details['background'] = ['[1/cm]', None, None]
@@ -76 +76 @@
 
                 ## fittable parameters
-        self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
+        self.fixed=['short_a.width', 'long_b.width', 'longer_c.width', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
         
         ## parameters with orientation