Changeset acf8e4a5 in sasview for test/sasfit/test/utest_fit_line.py

Timestamp:

Mar 31, 2015 11:52:01 AM (9 years ago)

Author:

Paul Kienzle <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:

4342107f, c971c98

Parents:

6987c8a

Message:

reference BumpsFit? directly and remove fit engine selection layer

File:

• test/sasfit/test/utest_fit_line.py (modified) (7 diffs)

test/sasfit/test/utest_fit_line.py

@@ -8 +8 @@
 from sas.fit.AbstractFitEngine import Model, FitHandler
 from sas.dataloader.loader import Loader
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.models.LineModel import LineModel
 from sas.models.Constant import Constant
@@ -16 +16 @@
 
     def test_bad_pars(self):
-        fitter = Fit('bumps')
+        fitter = Fit()
 
         data = Loader().load("testdata_line.txt")
@@ -34 +34 @@
             raise AssertionError("No error raised for fitting with wrong parameters name to fit")
 
-    def fit_single(self, fitter_name, isdream=False):
-        fitter = Fit(fitter_name)
+    def fit_single(self, isdream=False):
+        fitter = Fit()
 
         data = Loader().load("testdata_line.txt")
@@ -74 +74 @@
         #print "fitting",alg,opts
         #kprint "options",fitters.FIT_OPTIONS[alg].__dict__
-        self.fit_single('bumps', isdream=(alg=='dream'))
+        self.fit_single(isdream=(alg=='dream'))
 
     def test_bumps_de(self):
@@ -102 +102 @@
      
         #Importing the Fit module
-        fitter = Fit('bumps')
+        fitter = Fit()
         # Receives the type of model for the fitting
         model11  = LineModel()
@@ -161 +161 @@
         
         #Importing the Fit module
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(data1,1)
         fitter.set_model(model1,1,pars1)
@@ -194 +194 @@
         #Importing the Fit module
 
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(data1,1,qmin=0, qmax=7)
         fitter.set_model(model,1,pars1)