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

test/sasfit/test/batch_fit.py

@@ -3 +3 @@
 import unittest
 from sas.dataloader.loader import Loader
-from sas.fit.Fitting import Fit
+from sas.fit.Fitting import BumpsFit as Fit
 from sas.models.CylinderModel import CylinderModel
 import sas.models.dispersion_models 
@@ -42 +42 @@
         self.qmax = qmax
         
-    def _reset_helper(self, path=None, engine="bumps", npts=NPTS):
+    def _reset_helper(self, path=None, npts=NPTS):
         """
-        Set value to fitter engine and prepare inputs for map function
+        Set value to fitter and prepare inputs for map function
         """
         for i in range(npts):
             data = Loader().load(path)
-            fitter = Fit(engine)
+            fitter = Fit()
             #create model
             model = CylinderModel()
@@ -77 +77 @@
             self.list_of_mapper.append(classMapper)
                    
-    def reset_value(self, engine='bumps'):
+    def reset_value(self):
         """
         Initialize inputs for the map function
@@ -88 +88 @@
 
         path = "testdata_line3.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "testdata_line.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "SILIC010_noheader.DAT"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "cyl_400_20.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "sphere_80.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "PolySpheres.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "latex_qdev.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)
         path = "latex_qdev2.txt"
-        self._reset_helper(path=path, engine=engine, npts=NPTS)
+        self._reset_helper(path=path, npts=NPTS)