Changeset 7d0c1a8 in sasview for park_integration/ParkFitting.py

Timestamp:

Oct 9, 2008 12:33:14 PM (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:

385d464

Parents:

fb8d4050

Message:

introduced fitdata1D and fitdata2D class instead of Data class.

File:

• park_integration/ParkFitting.py (modified) (3 diffs)

park_integration/ParkFitting.py

@@ -10 +10 @@
 from park import assembly
 from park.fitmc import FitSimplex, FitMC
-from sans.guitools.plottables import Data1D
+
 from Loader import Load
-from AbstractFitEngine import FitEngine,FitArrange,Model
+from AbstractFitEngine import FitEngine
 
 
@@ -75 +75 @@
             i+=1
             Ldata=item.get_data()
-            parkdata=self._concatenateData(Ldata)
-            
+            #parkdata=self._concatenateData(Ldata)
+            parkdata=Ldata
             fitness=(parkmodel,parkdata)
             mylist.append(fitness)
@@ -120 +120 @@
                          fitter=fitter,
                          handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
+        #handler = fitresult.ConsoleUpdate(improvement_delta=0.1)
+        #models=self.problem
+        #service=None
+        #if models is None: raise RuntimeError('fit expected a list of models')
+        #from park.fit import LocalQueue,FitJob
+        #if service is None: service = LocalQueue()
+        #if fitter is None: fitter = fitmc.FitMC()
+        #if handler is None: handler = fitresult.FitHandler()
+    
+        #objective = assembly.Assembly(models) if isinstance(models,list) else models
+        #job = FitJob(self.problem,fitter,handler)
+        #service.start(job)
+        #import wx
+        #while not self.job.handler.done:
+        #    time.sleep(interval)
+        #    wx.Yield()
+        #result=service.job.handler.result
+        
         if result !=None:
             return result