Changeset 96656e3 in sasview for sansmodels/src/sans/models/LamellarModel.py
- Timestamp:
- Jan 6, 2011 12:42:14 PM (14 years ago)
- 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:
- 3be060d
- Parents:
- b9b9930
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/LamellarModel.py
r35aface r96656e3 28 28 from sans_extension.c_models import CLamellarModel 29 29 import copy 30 30 31 def create_LamellarModel(): 32 obj = LamellarModel() 33 #CLamellarModel.__init__(obj) is called by LamellarModel constructor 34 return obj 35 31 36 class LamellarModel(CLamellarModel, BaseComponent): 32 37 """ … … 49 54 # Initialize BaseComponent first, then sphere 50 55 BaseComponent.__init__(self) 56 #apply(CLamellarModel.__init__, (self,)) 51 57 CLamellarModel.__init__(self) 52 58 … … 76 82 77 83 ## non-fittable parameters 78 self.non_fittable =[]84 self.non_fittable = [] 79 85 80 86 ## parameters with orientation 81 self.orientation_params = []87 self.orientation_params = [] 82 88 89 def __reduce_ex__(self, proto): 90 """ 91 Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 92 c model. 93 """ 94 return (create_LamellarModel,tuple()) 95 83 96 def clone(self): 84 97 """ Return a identical copy of self """ 85 98 return self._clone(LamellarModel()) 86 87 def __getstate__(self):88 """89 return object state for pickling and copying90 """91 model_state = {'params': self.params, 'dispersion': self.dispersion, 'log': self.log}92 93 return self.__dict__, model_state94 95 def __setstate__(self, state):96 """97 create object from pickled state98 99 :param state: the state of the current model100 101 """102 103 self.__dict__, model_state = state104 self.params = model_state['params']105 self.dispersion = model_state['dispersion']106 self.log = model_state['log']107 99 108 100
Note: See TracChangeset
for help on using the changeset viewer.