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

Timestamp:

Aug 14, 2009 5: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/StackedDisksModel.py (modified) (3 diffs)

sansmodels/src/sans/models/StackedDisksModel.py

@@ -34 +34 @@
          scale           = 0.01 
          radius          = 3000.0 [A]
-         length          = 10.0 [A]
-         thickness       = 15.0 [A]
+         core_thick      = 10.0 [A]
+         layer_thick     = 15.0 [A]
          core_sld        = 4e-006 [1/A²]
          layer_sld       = -4e-007 [1/A²]
          solvent_sld     = 5e-006 [1/A²]
-         nlayers         = 1.0 
-         spacing         = 0.0 
+         n_stacking      = 1.0 
+         sigma_d         = 0.0 
          background      = 0.001 [1/cm]
-         axis_theta      = 1.0 [rad]
-         axis_phi        = 1.0 [rad]
+         axis_theta      = 0.0 [rad]
+         axis_phi        = 0.0 [rad]
 
     """
@@ -63 +63 @@
         self.details['scale'] = ['', None, None]
         self.details['radius'] = ['[A]', None, None]
-        self.details['length'] = ['[A]', None, None]
-        self.details['thickness'] = ['[A]', None, None]
+        self.details['core_thick'] = ['[A]', None, None]
+        self.details['layer_thick'] = ['[A]', None, None]
         self.details['core_sld'] = ['[1/A²]', None, None]
         self.details['layer_sld'] = ['[1/A²]', None, None]
         self.details['solvent_sld'] = ['[1/A²]', None, None]
-        self.details['nlayers'] = ['', None, None]
-        self.details['spacing'] = ['', None, None]
+        self.details['n_stacking'] = ['', None, None]
+        self.details['sigma_d'] = ['', None, None]
         self.details['background'] = ['[1/cm]', None, None]
         self.details['axis_theta'] = ['[rad]', None, None]
@@ -75 +75 @@
 
                 ## fittable parameters
-        self.fixed=['length.width', 'radius.width', 'axis_theta.width', 'axis_phi.width']
+        self.fixed=['core_thick.width', 'layer_thick.width', 'radius.width', 'axis_theta.width', 'axis_phi.width']
         
         ## parameters with orientation