Changeset 946b452 in sasview for sansmodels/src/sans

Timestamp:

Aug 29, 2011 12:13:50 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

c832374d

Parents:

2c60cb69

Message:

improve pickling smearer

File:

• sansmodels/src/sans/models/qsmearing.py (modified) (6 diffs)

sansmodels/src/sans/models/qsmearing.py

@@ -404 +404 @@
     def __setstate__(self, state):
         """
+        Restore the state of the object by reconstruction the (smearer) object
         """
         self.__dict__, self.model,  self.data = state
@@ -409 +410 @@
         self._smearer = smearer.new_slit_smearer_with_q(self.width, 
                                                     self.height, self.qvalues)
+        self.__dict__['_smearer'] = self._smearer
         
     def __reduce_ex__(self, proto):
         """
-        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
-        c model.
+        Overwrite the __reduce_ex__to avoid pickle PyCobject(smearer)
         """
         model = copy.deepcopy(self.model)
         data = copy.deepcopy(self.data)
-        dict = self.__dict__
-        if "_smearer" in dict.keys():
-            del dict["_smearer"]
+        dict = {}
+        for k , v in self.__dict__.iteritems():
+            if k != "_smearer":
+                dict[k] = v
         state = (dict, model, data)
-        return (QSmearer, (data, model), state, None, None)
+        return (SlitSmearer, (data, model), state, None, None)
         
 
@@ -450 +452 @@
         self._weights = None
         self.qvalues  = None
+      
         
     def _initialize_smearer(self):
@@ -515 +518 @@
         ## Q-values
         self.qvalues = data1d_x
+       
         
     def __deepcopy__(self, memo={}):
@@ -541 +545 @@
     def __setstate__(self, state):
         """
+        Restore the state of the object by reconstruction the (smearer) object
         """
         self.__dict__, self.model,  self.data = state
@@ -546 +551 @@
         self._smearer =  smearer.new_q_smearer_with_q(numpy.asarray(self.width),
                                                       self.qvalues)
+        self.__dict__['_smearer'] = self._smearer
  
     def __reduce_ex__(self, proto):
         """
-        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
-        c model.
+        Overwrite the __reduce_ex__to avoid pickle PyCobject(smearer)
         """
         model = copy.deepcopy(self.model)
         data = copy.deepcopy(self.data)
-        dict = self.__dict__
-        if "_smearer" in dict.keys():
-            del dict["_smearer"]
+        dict = {}
+        for k , v in self.__dict__.iteritems():
+            if k != "_smearer":
+                dict[k] = v
         state = (dict, model, data)
         return (QSmearer, (data, model), state, None, None)