Changeset 96656e3 in sasview for sansmodels/src/sans/models/OblateModel.py
- Timestamp:
- Jan 6, 2011 2: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/OblateModel.py
r4628e31 r96656e3 28 28 from sans_extension.c_models import COblateModel 29 29 import copy 30 30 31 def create_OblateModel(): 32 obj = OblateModel() 33 #COblateModel.__init__(obj) is called by OblateModel constructor 34 return obj 35 31 36 class OblateModel(COblateModel, BaseComponent): 32 37 """ … … 54 59 # Initialize BaseComponent first, then sphere 55 60 BaseComponent.__init__(self) 61 #apply(COblateModel.__init__, (self,)) 56 62 COblateModel.__init__(self) 57 63 … … 94 100 95 101 ## non-fittable parameters 96 self.non_fittable =[]102 self.non_fittable = [] 97 103 98 104 ## parameters with orientation 99 self.orientation_params = ['axis_phi', 'axis_theta', 'axis_phi.width', 'axis_theta.width']105 self.orientation_params = ['axis_phi', 'axis_theta', 'axis_phi.width', 'axis_theta.width'] 100 106 107 def __reduce_ex__(self, proto): 108 """ 109 Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 110 c model. 111 """ 112 return (create_OblateModel,tuple()) 113 101 114 def clone(self): 102 115 """ Return a identical copy of self """ 103 116 return self._clone(OblateModel()) 104 105 def __getstate__(self):106 """107 return object state for pickling and copying108 """109 model_state = {'params': self.params, 'dispersion': self.dispersion, 'log': self.log}110 111 return self.__dict__, model_state112 113 def __setstate__(self, state):114 """115 create object from pickled state116 117 :param state: the state of the current model118 119 """120 121 self.__dict__, model_state = state122 self.params = model_state['params']123 self.dispersion = model_state['dispersion']124 self.log = model_state['log']125 117 126 118
Note: See TracChangeset
for help on using the changeset viewer.