Changeset 4de1fed in sasview

Timestamp:

May 8, 2014 8:08:28 AM (11 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:

8d074d9

Parents:

e544c84

Message:

enable small test unit test

Location:

test/park_integration/test

Files:

• batch_fit.py (modified) (1 diff)
• utest_small_test.py (moved) (moved from test/park_integration/test/small_test.py) (2 diffs)

test/park_integration/test/batch_fit.py

@@ -1 +1 @@
 
 
-import math
-import numpy
 import copy
 import time

test/park_integration/test/utest_small_test.py

@@ -5 +5 @@
 import math
 from sans.fit.Fitting import Fit
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 
 class testFitModule(unittest.TestCase):
@@ -18 +18 @@
         from sans.models.CylinderModel import CylinderModel
         model  = CylinderModel()
-        model.setParam('contrast', 1)
-       
+        model.setParam('sldCyl', 1)
+        model.setParam('sldSolv', 0)
+
         pars1 =['length','radius','scale']
         fitter.set_data(out,1)
         model.setParam('scale', 1e-10)
         fitter.set_model(model,1,pars1, constraints=())
-        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)