Changeset 96656e3 in sasview for sansmodels/src/sans/models/TriaxialEllipsoidModel.py

Timestamp:

Jan 6, 2011 2:42:14 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:

3be060d

Parents:

b9b9930

Message:

update models due to changes of template

File:

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

sansmodels/src/sans/models/TriaxialEllipsoidModel.py

@@ -28 +28 @@
 from sans_extension.c_models import CTriaxialEllipsoidModel
 import copy    
-    
+
+def create_TriaxialEllipsoidModel():
+    obj = TriaxialEllipsoidModel()
+    #CTriaxialEllipsoidModel.__init__(obj) is called by TriaxialEllipsoidModel constructor
+    return obj
+
 class TriaxialEllipsoidModel(CTriaxialEllipsoidModel, BaseComponent):
     """ 
@@ -54 +59 @@
         # Initialize BaseComponent first, then sphere
         BaseComponent.__init__(self)
+        #apply(CTriaxialEllipsoidModel.__init__, (self,)) 
         CTriaxialEllipsoidModel.__init__(self)
         
@@ -80 +86 @@
         
         ## non-fittable parameters
-        self.non_fittable=[]
+        self.non_fittable = []
         
         ## parameters with orientation
-        self.orientation_params =['axis_psi', 'axis_phi', 'axis_theta', 'axis_psi.width', 'axis_phi.width', 'axis_theta.width']
+        self.orientation_params = ['axis_psi', 'axis_phi', 'axis_theta', 'axis_psi.width', 'axis_phi.width', 'axis_theta.width']
    
+    def __reduce_ex__(self, proto):
+        """
+        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
+        c model.
+        """
+        return (create_TriaxialEllipsoidModel,tuple())
+        
     def clone(self):
         """ Return a identical copy of self """
         return self._clone(TriaxialEllipsoidModel())   
-        
-    def __getstate__(self):
-        """
-        return object state for pickling and copying
-        """
-        model_state = {'params': self.params, 'dispersion': self.dispersion, 'log': self.log}
-        
-        return self.__dict__, model_state
-        
-    def __setstate__(self, state):
-        """
-        create object from pickled state
-        
-        :param state: the state of the current model
-        
-        """
-        
-        self.__dict__, model_state = state
-        self.params = model_state['params']
-        self.dispersion = model_state['dispersion']
-        self.log = model_state['log']