Changeset 1374174f in sasview for park_integration

Timestamp:

Sep 22, 2008 4:07:53 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:

3931a24e

Parents:

2e83ff3

Message:

Use common Loader. Fix test (A,B params were inverted)

File:

• park_integration/test/test_fit_line.py (modified) (2 diffs)

park_integration/test/test_fit_line.py

@@ -12 +12 @@
         """ Fit 1 data (testdata_line.txt)and 1 model(lineModel)  """
         #load data
-        from sans.fit.Loader import Load
-        load = Load()
-        load.set_filename("testdata_line.txt")
-        load.set_values()
-        data1 = Data1D(x=[], y=[],dx=None, dy=None)
-        load.load_data(data1)
+        from DataLoader.loader import Loader
+        data1 = Loader().load("testdata_line.txt")
         #Importing the Fit module
         from sans.fit.Fitting import Fit
@@ -157 +153 @@
         result2 = fitter.fit()
         self.assert_(result2)
-        self.assertTrue( ( math.fabs(result2.pvec[0]-4)/3 == result2.stderr[0] ) or 
-                         ( math.fabs(result2.pvec[0]-4)/3 < result2.stderr[0]) ) 
-        
-        self.assertTrue( ( math.fabs(result2.pvec[1]-2.5)/3 == result2.stderr[1] ) or
-                         ( math.fabs(result2.pvec[1]-2.5)/3 < result2.stderr[1]) )
+        print result2.pvec[0],  result2.stderr[0]
+        print result2.pvec[1],  result2.stderr[1]
+        self.assertTrue( ( math.fabs(result2.pvec[0]-2.5)/3. < result2.stderr[0]) ) 
+        
+        self.assertTrue( ( math.fabs(result2.pvec[1]-4.0)/3. < result2.stderr[1]) )
         self.assertTrue(result2.fitness/49 < 2)