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

Timestamp:

Apr 4, 2014 12:44:59 PM (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_fit_cylinder.py (modified) (9 diffs)

test/park_integration/test/test_fit_cylinder.py

@@ -4 +4 @@
 """
 import unittest
+import math
 
 from sans.fit.AbstractFitEngine import Model
-import math
 from sans.fit.Fitting import Fit
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 
 class TestSingleFit(unittest.TestCase):
@@ -21 +21 @@
         self.model.setParam("radius",18)
         self.model.setParam("length", 397)
-        self.model.setParam("contrast",3e-006 )
+        self.model.setParam("sldCyl",3e-006 )
+        self.model.setParam("sldSolv",0.0 )
         self.model.setParam("background", 0.0)
         #select parameters to fit
@@ -31 +32 @@
         fitter.set_data(self.data,1)
         fitter.set_model(self.model,1,self.pars1)
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         return  fitter.fit()
        
@@ -38 +39 @@
         """ Simple cylinder model fit (scipy)  """
         
-        result1 = self._fit("scipy")
+        result1, = self._fit("scipy")
         
         self.assert_(result1)
@@ -52 +53 @@
     def test_park(self):
         """ Simple cylinder model fit (park)  """
-        result1 = self._fit("park")
+        #raise NotImplementedError()
+        result1, = self._fit("park")
         
         self.assert_(result1)
@@ -81 +83 @@
         self.model1.set(radius=18)
         self.model1.set(length=396)
-        self.model1.set(contrast=3e-006 )
+        self.model1.set(sldCyl=3e-006, sldSolv=0.0)
         self.model1.set(background=0.0)
         
@@ -90 +92 @@
         self.model2.set(radius=37)
         self.model2.set(length='C1.length')
-        self.model2.set(contrast=3e-006 )
+        self.model2.set(sldCyl=3e-006, sldSolv=0.0)
         self.model2.set(background=0.0)
        
@@ -101 +103 @@
         fitter.set_data(self.data2,2)
         fitter.set_model(self.model2, 2, ['radius','scale'])
-        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)
         return fitter.fit()
     
@@ -108 +110 @@
     def test_park2(self):
         """ Simultaneous cylinder model fit (park)  """
-        
-        result1= self._fit('park')
+        #raise NotImplementedError()
+        result1,= self._fit('park')
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>=0  )