Changeset 96656e3 in sasview for sansmodels/src/sans/models/ParallelepipedModel.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/ParallelepipedModel.py
r4628e31 r96656e3 28 28 from sans_extension.c_models import CParallelepipedModel 29 29 import copy 30 30 31 def create_ParallelepipedModel(): 32 obj = ParallelepipedModel() 33 #CParallelepipedModel.__init__(obj) is called by ParallelepipedModel constructor 34 return obj 35 31 36 class ParallelepipedModel(CParallelepipedModel, BaseComponent): 32 37 """ … … 54 59 # Initialize BaseComponent first, then sphere 55 60 BaseComponent.__init__(self) 61 #apply(CParallelepipedModel.__init__, (self,)) 56 62 CParallelepipedModel.__init__(self) 57 63 … … 86 92 87 93 ## non-fittable parameters 88 self.non_fittable =[]94 self.non_fittable = [] 89 95 90 96 ## parameters with orientation 91 self.orientation_params = ['parallel_phi', 'parallel_psi', 'parallel_theta', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width']97 self.orientation_params = ['parallel_phi', 'parallel_psi', 'parallel_theta', 'parallel_phi.width', 'parallel_psi.width', 'parallel_theta.width'] 92 98 99 def __reduce_ex__(self, proto): 100 """ 101 Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 102 c model. 103 """ 104 return (create_ParallelepipedModel,tuple()) 105 93 106 def clone(self): 94 107 """ Return a identical copy of self """ 95 108 return self._clone(ParallelepipedModel()) 96 97 def __getstate__(self):98 """99 return object state for pickling and copying100 """101 model_state = {'params': self.params, 'dispersion': self.dispersion, 'log': self.log}102 103 return self.__dict__, model_state104 105 def __setstate__(self, state):106 """107 create object from pickled state108 109 :param state: the state of the current model110 111 """112 113 self.__dict__, model_state = state114 self.params = model_state['params']115 self.dispersion = model_state['dispersion']116 self.log = model_state['log']117 109 118 110
Note: See TracChangeset
for help on using the changeset viewer.