Changeset 6c00702 in sasview for test/park_integration/test/test_park_scipy.py

Timestamp:

Apr 4, 2014 10:44:59 AM (10 years ago)

Author:

pkienzle

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:

d44648e

Parents:

e6d9703

Message:

correct fitting tests so that they run (though not yet automatically)

File:

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

test/park_integration/test/test_park_scipy.py

@@ -4 +4 @@
 """
 import unittest
+import math
 
 from sans.guiframe.dataFitting import Data1D 
 from sans.fit.AbstractFitEngine import Model,FitData1D
-import math
 from sans.fit.Fitting import Fit
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
+from sans.models.MultiplicationModel import MultiplicationModel
+from sans.models.CylinderModel import CylinderModel
+from sans.models.SquareWellStructure import SquareWellStructure
 
 class testFitModule(unittest.TestCase):
@@ -21 +24 @@
         data = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.dy)
         # Receives the type of model for the fitting
-        from sans.models.MultiplicationModel import MultiplicationModel
-        from sans.models.CylinderModel import CylinderModel
-        from sans.models.SquareWellStructure import SquareWellStructure
         model1  =  MultiplicationModel(CylinderModel(),SquareWellStructure())
         model1.setParam('background', 0.0)
-        model1.setParam('contrast', 3e-006)
-        model1.setParam('length', 600)
-        model1.setParam('radius', 20)
-        model1.setParam('scale', 10)
+        model1.setParam('sldCyl', 3e-006)
+        model1.setParam('sldSolv', 0.0)
+        model1.setParam('length', 420)
+        model1.setParam('radius', 40)
+        model1.setParam('scale_factor', 2)
         model1.setParam('volfraction', 0.04)
         model1.setParam('welldepth', 1.5)
@@ -36 +37 @@
         model = Model(model1)
     
-        pars1 =['length','radius','scale']
+        pars1 =['length','radius','scale_factor']
         fitter = Fit('scipy')
         fitter.set_data(data,1)
         fitter.set_model(model,1,pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
-        result1 = fitter.fit()
-      
+        fitter.select_problem_for_fit(id=1,value=1)
+        result1, = fitter.fit()
+
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>=0 )
         self.assertTrue(len(result1.stderr)>= 0)
-        
+
+        print "results",list(zip(result1.pvec, result1.stderr))
         self.assertTrue( math.fabs(result1.pvec[0]-605)/3.0 <= result1.stderr[0] )
         self.assertTrue( math.fabs(result1.pvec[1]-20.0)/3.0  <= result1.stderr[1] )