Changeset bc873053 in sasview for test/sasfit

Timestamp:

Nov 10, 2015 5:39:44 PM (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:

80ba1a2

Parents:

40c69b3

Message:

Fix slit height resolution problem. Still issues with slit width. Refs #472

Location:

test/sasfit/test

Files:

• utest_fit_line.py (modified) (2 diffs)
• utest_fit_smeared.py (modified) (2 diffs)

test/sasfit/test/utest_fit_line.py

@@ -11 +11 @@
 from sas.models.LineModel import LineModel
 from sas.models.Constant import Constant
+
+from bumps import fitters
+try:
+    from bumps.options import FIT_CONFIG
+    def set_fitter(alg, opts):
+        FIT_CONFIG.selected_id = alg
+        FIT_CONFIG.values[alg].update(opts, monitors=[])
+except:
+    # CRUFT: Bumps changed its handling of fit options around 0.7.5.6
+    def set_fitter(alg, opts):
+        #print "fitting",alg,opts
+        #print "options",fitters.FIT_OPTIONS[alg].__dict__
+        fitters.FIT_DEFAULT = alg
+        fitters.FIT_OPTIONS[alg].options.update(opts, monitors=[])
+
 
 class testFitModule(unittest.TestCase):
@@ -67 +82 @@
 
     def fit_bumps(self, alg, **opts):
-        #Importing the Fit module
-        from bumps import fitters
-        fitters.FIT_DEFAULT = alg
-        fitters.FIT_OPTIONS[alg].options.update(opts)
-        fitters.FIT_OPTIONS[alg].options.update(monitors=[])
-        #print "fitting",alg,opts
-        #kprint "options",fitters.FIT_OPTIONS[alg].__dict__
+        set_fitter(alg, opts)
         self.fit_single(isdream=(alg=='dream'))
 

test/sasfit/test/utest_fit_smeared.py

@@ -13 +13 @@
 from sas.models.CylinderModel import CylinderModel
 from sas.models.SphereModel import SphereModel
+
+
+from bumps import fitters
+try:
+    from bumps.options import FIT_CONFIG
+    def set_fitter(alg, opts):
+        FIT_CONFIG.selected_id= alg
+        FIT_CONFIG.values[alg].update(opts, monitors=[])
+except:
+    # CRUFT: Bumps changed its handling of fit options around 0.7.5.6
+    def set_fitter(alg, opts):
+        #print "fitting",alg,opts
+        #print "options",fitters.FIT_OPTIONS[alg].__dict__
+        fitters.FIT_DEFAULT = alg
+        fitters.FIT_OPTIONS[alg].options.update(opts, monitors=[])
+
 
 class testFitModule(unittest.TestCase):
@@ -57 +73 @@
             Cylinder fit with dispersion
         """
-        alg = 'lm'
-        from bumps import fitters
-        fitters.FIT_DEFAULT = alg
-        #fitters.FIT_OPTIONS[alg].options.update(opts)
-        fitters.FIT_OPTIONS[alg].options.update(monitors=[])
+        set_fitter('lm', {})
         self._dispersion(fitter = Fit())