Changeset 985c88b in sasview for park_integration/test/testpark.py

Timestamp:

Aug 12, 2008 4:45:44 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:

4245594

Parents:

f44dbc7

Message:

testing modified

File:

• park_integration/test/testpark.py (modified) (3 diffs)

park_integration/test/testpark.py

@@ -40 +40 @@
         
         #Do the fit
-        fitter.set_model(model1,"M1",1, {'A':2.5,'B':4})
+        model1.setParam( 'A', 2.5)
+        model1.setParam( 'B', 4)
+        fitter.set_model(model1,"M1",1, ['A','B'])
         fitter.set_data(data1,1)
         
-        fitter.set_model(model2,"M2",2, {'A':2,'B':3})
+        model1.setParam( 'A', 2)
+        model1.setParam( 'B', 3)
+        fitter.set_model(model2,"M2",2, ['A','B'])
         fitter.set_data(data2,2)
         
-        chisqr1, out1, cov1= fitter.fit()
+        chisqr1, out1, cov1,result= fitter.fit()
         
         self.assert_(math.fabs(out1[1]-2.5)/math.sqrt(cov1[1][1]) < 2)
@@ -60 +64 @@
         
         fitter.set_data(data3,1)
-        chisqr2, out2, cov2= fitter.fit(None,None)
+        chisqr2, out2, cov2, result= fitter.fit(None,None)
         self.assert_(math.fabs(out2[1]-2.5)/math.sqrt(cov2[1][1]) < 2)
         print math.fabs(out2[0]-4.0)/math.sqrt(cov2[0][0])
@@ -98 +102 @@
         print chisqr1,chisqr2,chisqr3
         #self.assertAlmostEquals(chisqr1,chisqr2)
+        self.assert_(chisqr1)