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