Changeset dd8ee14 in sasview

Timestamp:

Apr 7, 2011 11:37:32 AM (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:

078f2f2

Parents:

64e44c1

Message:

working on sansview with processing module

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• test/test_fit_line.py (modified) (8 diffs)

park_integration/AbstractFitEngine.py

@@ -469 +469 @@
 
             if self.curr_thread != None :
-                    try:
-                        self.curr_thread.isquit()
-                    except:
-                        raise FitAbort,"stop leastsqr optimizer"    
+                    if not self.curr_thread.isAlive():
+                       raise FitAbort,"stop leastsqr optimizer"    
         return self.res
     

park_integration/setup.py

@@ -6 +6 @@
 from distutils.core import setup, Extension
 
-
+import sys
+if len(sys.argv) == 1:
+    sys.argv.append('install')
 setup(
     name="sans.fit",

park_integration/test/test_fit_line.py

@@ -35 +35 @@
         pars1= ['A','B']
         fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         result1 = fitter.fit()
         self.assert_(result1)
@@ -47 +47 @@
         fitter.set_data(data,1)
         fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         result2 = fitter.fit()
         
@@ -88 +88 @@
         fitter.set_data(data1,1)
         fitter.set_model(model1,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=0)
+        fitter.select_problem_for_fit(id=1,value=0)
         fitter.set_data(data2,2)
         fitter.set_model(model2,2,pars1)
-        fitter.select_problem_for_fit(Uid=2,value=0)
+        fitter.select_problem_for_fit(id=2,value=0)
         
         try: result1 = fitter.fit()
@@ -97 +97 @@
            assert str(msg)=="No Assembly scheduled for Scipy fitting."
         else: raise AssertError,"No error raised for scipy fitting with no model"
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        fitter.select_problem_for_fit(Uid=2,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
+        fitter.select_problem_for_fit(id=2,value=1)
         try: result1 = fitter.fit()
         except RuntimeError,msg:
@@ -110 +110 @@
         fitter.set_data(data2,2)
         fitter.set_model(model2,2,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        fitter.select_problem_for_fit(Uid=2,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
+        fitter.select_problem_for_fit(id=2,value=1)
         result2 = fitter.fit()
         
@@ -157 +157 @@
         fitter.set_data(data2,2,smearer=None)
         fitter.set_model(model2,2,pars2)
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        fitter.select_problem_for_fit(Uid=2,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
+        fitter.select_problem_for_fit(id=2,value=1)
         
         result2 = fitter.fit()
@@ -192 +192 @@
         fitter.set_model(model,1,pars1)
         fitter.set_data(data2,1,qmin=1,qmax=10)
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         
         result1 = fitter.fit()
@@ -206 +206 @@
         fitter.set_model(model,1,pars1)
         fitter.set_data(data2,1,qmin=1,qmax=10)
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         result2 = fitter.fit()