Changeset 6d20b46 in sasview for park_integration/AbstractFitEngine.py

Timestamp:

Jan 20, 2010 1:54:52 PM (14 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:

662da312

Parents:

e6b9723

Message:

working on thread issues [incomplete]

File:

• park_integration/AbstractFitEngine.py (modified) (6 diffs)

park_integration/AbstractFitEngine.py

@@ -1 +1 @@
 import logging, sys
+import copy
+from copy import deepcopy
 import park,numpy,math, copy
 from DataLoader.data_info import Data1D
@@ -79 +81 @@
         self.pars=[]
   
-  
+    def clone(self):
+        model = self.model.clone()
+        model.name = self.model.name
+        return Model(model)
     def getParams(self,fitparams):
         """
@@ -337 +342 @@
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method
     """
-    def __init__(self,paramlist,Model=None , Data=None, curr_thread= None):
-        """
-            @param Model: the model wrapper fro sans -model
-            @param Data: the data wrapper for sans data
-        """
-        self.model = Model
-        self.data  = Data
-        self.paramlist=paramlist
+    def __init__(self,paramlist,model=None , data=None, curr_thread= None):
+        """
+            @param model: the model wrapper for sans -model
+            @param data: the data wrapper for sans data
+        """
+        self.model = model.clone()
+        self.data  = deepcopy(data)
+        self.paramlist = deepcopy(paramlist)
         self.curr_thread= curr_thread
         self.res=[]
@@ -457 +462 @@
         if model == None:
             raise ValueError, "AbstractFitEngine: Need to set model to fit"
-        
-        new_model= model
-        if not issubclass(model.__class__, Model):
-            new_model= Model(model)
+        #print "set_model",model.name
+        #new_model= deepcopy(model)
+        new_model = model.clone()
+        new_model.name = model.name
+        if not issubclass(new_model.__class__, Model):
+            new_model= Model(new_model)
         
         if len(constraints)>0:
@@ -506 +513 @@
             @param Uid: unique key corresponding to a fitArrange object with data
         """
+        #print "set_data",data.__class__.__name__
         if data.__class__.__name__=='Data2D':
             fitdata=FitData2D(sans_data2d=data, data=data.data, err_data= data.err_data)
         else:
             fitdata=FitData1D(x=data.x, y=data.y , dx= data.dx,dy=data.dy,smearer=smearer)
-       
+        
         fitdata.setFitRange(qmin=qmin,qmax=qmax)
         #A fitArrange is already created but contains model only at Uid
@@ -578 +586 @@
         """
         self.model = model
+        self.model.name = model.name
         
     def add_data(self,data):