Changeset 8e36cdd in sasview for sansmodels/src/sans/models/ParallelepipedModel.py

Timestamp:

Aug 20, 2009 1:24:23 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:

1d67243

Parents:

191b369

Message:

fixed and tested ppmodel 2d and cleaned it up.

File:

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

sansmodels/src/sans/models/ParallelepipedModel.py

@@ -34 +34 @@
          scale           = 1.0 
          short_a         = 35.0 [A]
-         long_b          = 75.0 [A]
-         longer_c        = 400.0 [A]
+         short_b         = 75.0 [A]
+         long_c          = 400.0 [A]
          contrast        = 5.3e-006 [1/A²]
          background      = 0.0 [1/cm]
@@ -57 +57 @@
                 
                 scale:Scale factor
-                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]
+                short_a: length of short edge  [A]
+                short_b: length of another short edge [A]
+                long_c: length of long edge  of the parallelepiped [A]
                 contrast: particle_sld - solvent_sld
                 background:Incoherent Background [1/cm]"""
@@ -67 +67 @@
         self.details['scale'] = ['', 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['short_b'] = ['[A]', None, None]
+        self.details['long_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_a.width', 'long_b.width', 'longer_c.width', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
+        self.fixed=['short_a.width', 'short_b.width', 'long_c.width', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
         
         ## parameters with orientation