Changeset 975ec8e in sasview for sansmodels/src/sans/models/ParallelepipedModel.py

Timestamp:

Aug 14, 2009 3:58:58 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:

d5bd424

Parents:

cad821b

Message:

working on 2D models. Still need smore corrections and unit tests.

File:

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

sansmodels/src/sans/models/ParallelepipedModel.py

@@ -38 +38 @@
          contrast        = 5.3e-006 [1/A²]
          background      = 0.0 [1/cm]
-         parallel_theta  = 1.0 [rad]
-         parallel_phi    = 1.0 [rad]
+         parallel_theta  = 0.0 [rad]
+         parallel_phi    = 0.0 [rad]
+         parallel_psi    = 0.0 [rad]
 
     """
@@ -72 +73 @@
         self.details['parallel_theta'] = ['[rad]', None, None]
         self.details['parallel_phi'] = ['[rad]', None, None]
+        self.details['parallel_psi'] = ['[rad]', None, None]
 
                 ## fittable parameters
-        self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width', 'parallel_phi.width', 'parallel_theta.width']
+        self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
         
         ## parameters with orientation
-        self.orientation_params =['parallel_phi', 'parallel_theta', 'parallel_phi.width', 'parallel_theta.width']
+        self.orientation_params =['parallel_phi', 'parallel_psi', 'parallel_theta', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']
    
     def clone(self):