Changeset 8809e48 in sasview for sansmodels/src/sans/models/BaseComponent.py

Timestamp:

Oct 15, 2008 1:01:06 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

00353b4

Parents:

ae60f86

Message:

Updated cloning

File:

• sansmodels/src/sans/models/BaseComponent.py (modified) (2 diffs)

sansmodels/src/sans/models/BaseComponent.py

@@ -38 +38 @@
     def clone(self):
         """ Returns a new object identical to the current object """
-        
         obj = copy.deepcopy(self)
+        return self._clone(obj)
+    
+    def _clone(self, obj):
+        """
+            Internal utility function to copy the internal
+            data members to a fresh copy.
+        """
         obj.params     = copy.deepcopy(self.params)
         obj.details    = copy.deepcopy(self.details)
         obj.dispersion = copy.deepcopy(self.dispersion)
-    
         return obj
 
@@ -70 +75 @@
             
         raise ValueError, "Model does not contain parameter %s" % name
-        
-
-    def _setParam(self, name, value):
-        """ 
-            Set the value of a model parameter
-        
-            @param name: name of the parameter
-            @param value: value of the parameter
-        """
-        # Look for dispersion parameters
-        toks = name.split('.')
-        if len(toks)==2 and toks[0] in self.dispersion:
-            # Setting a dispersion model parameter
-            if toks[1] in self.dispersion[toks[0]]: 
-                self.dispersion[toks[0]][toks[1]] = value
-                return
-            else:
-                raise ValueError, "Model does not contain parameter %s.%s" % (toks[0], toks[1])
-        
-        if name in self.params.keys():
-            self.params[name] = value
-        else:
-            raise ValueError, "Model does not contain parameter %s" % name
-        
-    def _getParam(self, name):
-        """ 
-            Set the value of a model parameter
-
-            @param name: name of the parameter
-        """
-        # Look for dispersion parameters
-        toks = name.split('.')
-        if len(toks)==2 and toks[0] in self.dispersion:
-            # Setting a dispersion model parameter
-            if toks[1] in self.dispersion[toks[0]]: 
-                return self.dispersion[toks[0]][toks[1]] 
-            else:
-                raise ValueError, "Model does not contain parameter %s.%s" % (toks[0], toks[1])
-
-        if name in self.params.keys():
-            return self.params[name]
-        else:
-            raise ValueError, "Model does not contain parameter %s" % name
         
     def getParam(self, name):