Changeset a68efd1 in sasview for sansmodels

Timestamp:

Mar 31, 2009 11:10:38 AM (16 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:

9853ad0

Parents:

cd3d15b

Message:

implement clone function for 3 models

Location:

sansmodels/src/sans/models

Files:

• MultiplicationModel.py (modified) (2 diffs)
• NoStructure.py (modified) (1 diff)
• NullModel.py (modified) (1 diff)

sansmodels/src/sans/models/MultiplicationModel.py

@@ -2 +2 @@
 from sans.models.BaseComponent import BaseComponent
 import numpy, math
-
+import copy
 class MultiplicationModel(BaseComponent):
     """
@@ -40 +40 @@
         self._set_fixed_params()  
         
-          
+    def _clone(self, obj):
+        """
+            Internal utility function to copy the internal
+            data members to a fresh copy.
+        """
+        obj.params     = copy.deepcopy(self.params)
+        obj.description     = copy.deepcopy(self.description)
+        obj.details    = copy.deepcopy(self.details)
+        obj.dispersion = copy.deepcopy(self.dispersion)
+        obj.model1  = self.model1.clone()
+        obj.model2  = self.model2.clone()
+        
+        return obj
+    
+    
     def _set_dispersion(self):
         """

sansmodels/src/sans/models/NoStructure.py

@@ -24 +24 @@
     def clone(self):
         """ Return a identical copy of self """
-        return 1
+        return self._clone(NoStructure())   
    
     def run(self, x = 0.0):

sansmodels/src/sans/models/NullModel.py

@@ -24 +24 @@
     def clone(self):
         """ Return a identical copy of self """
-        return 0
+        return self._clone(NullModel())   
    
     def run(self, x = 0.0):