Changeset 4cbaf35 in sasview for sansmodels/src/sans/models/BinaryHSModel.py

Timestamp:

Jan 7, 2010 3:00:43 PM (14 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:

c451be9

Parents:

4d270706

Message:

corrected problems in parameters called from Wrapper

File:

• sansmodels/src/sans/models/BinaryHSModel.py (modified) (3 diffs)

sansmodels/src/sans/models/BinaryHSModel.py

@@ -36 +36 @@
          vol_frac_ls     = 0.1 
          vol_frac_ss     = 0.2 
+         ls_sld          = 3.5e-006 [1/A^(2)]
+         ss_sld          = 5e-007 [1/A^(2)]
+         solvent_sld     = 6.36e-006 [1/A^(2)]
+         background      = 0.001 [1/cm]
 
     """
@@ -64 +68 @@
         self.details['vol_frac_ls'] = ['', None, None]
         self.details['vol_frac_ss'] = ['', None, None]
+        self.details['ls_sld'] = ['[1/A^(2)]', None, None]
+        self.details['ss_sld'] = ['[1/A^(2)]', None, None]
+        self.details['solvent_sld'] = ['[1/A^(2)]', None, None]
+        self.details['background'] = ['[1/cm]', None, None]
 
         ## fittable parameters
@@ -77 +85 @@
     def __getstate__(self):
         """ return object state for pickling and copying """
-        print "__dict__",self.__dict__
-        #self.__dict__['params'] = self.params
-        #self.__dict__['dispersion'] = self.dispersion
-        #self.__dict__['log'] = self.log
         model_state = {'params': self.params, 'dispersion': self.dispersion, 'log': self.log}