Changeset acf8e4a5 in sasview for test/sasfit/test/utest_fit_smeared.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_smeared.py (modified) (8 diffs)

test/sasfit/test/utest_fit_smeared.py

@@ -8 +8 @@
 import numpy
 from sas.fit.AbstractFitEngine import Model
-from sas.fit.Fitting import Fit
+from sas.fit.BumpsFitting import BumpsFit as Fit
 from sas.dataloader.loader import Loader
 from sas.models.qsmearing import smear_selection
@@ -24 +24 @@
         #out.dy = out.y
         
-        fitter = Fit('bumps')
+        fitter = Fit()
         fitter.set_data(out,1)
         
@@ -62 +62 @@
         #fitters.FIT_OPTIONS[alg].options.update(opts)
         fitters.FIT_OPTIONS[alg].options.update(monitors=[])
-        self._dispersion(fitter = Fit('bumps'))
+        self._dispersion(fitter = Fit())
 
     def _dispersion(self, fitter):
@@ -94 +94 @@
         #import time; T0 = time.time()
         result1, = fitter.fit()
-        #print "time",time.time()-T0,fitter._engine.__class__.__name__
-        
+
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0)
@@ -137 +136 @@
 
         # Fit
-        fitter = Fit('bumps')
+        fitter = Fit()
         
         # Data: right now this is the only way to set the smearer object
@@ -143 +142 @@
         # data for a given fit.
         fitter.set_data(self.data_res,1)
-        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
+        fitter.fit_arrange_dict[1].data_list[0].smearer = smear
 
         # Model: maybe there's a better way to do this.
@@ -169 +168 @@
         #self.assertEqual(smear.__class__.__name__, 'PySmearer')
 
-        fitter = Fit('bumps')
+        fitter = Fit()
         
         # Data: right now this is the only way to set the smearer object
@@ -175 +174 @@
         # data for a given fit.
         fitter.set_data(self.data_slit,1)
-        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
-        fitter._engine.fit_arrange_dict[1].data_list[0].qmax = 0.003
+        fitter.fit_arrange_dict[1].data_list[0].smearer = smear
+        fitter.fit_arrange_dict[1].data_list[0].qmax = 0.003
         
         # Model