Changeset 6c00702 in sasview for test/park_integration/test/test_fit_smeared.py

Timestamp:

Apr 4, 2014 10:44:59 AM (10 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:

d44648e

Parents:

e6d9703

Message:

correct fitting tests so that they run (though not yet automatically)

File:

• test/park_integration/test/test_fit_smeared.py (modified) (11 diffs)

test/park_integration/test/test_fit_smeared.py

@@ -4 +4 @@
 """
 import unittest
-from sans.fit.AbstractFitEngine import Model
 import math
 import numpy
+from sans.fit.AbstractFitEngine import Model
 from sans.fit.Fitting import Fit
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
+from sans.models.qsmearing import smear_selection
+from sans.models.CylinderModel import CylinderModel
+from sans.models.SphereModel import SphereModel
 
 class testFitModule(unittest.TestCase):
@@ -24 +27 @@
         
         # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
         model1  = CylinderModel()
-        model1.setParam('contrast', 1)
+        model1.setParam('sldCyl', 3.0e-6)
+        model1.setParam('sldSolv', 0.0)
         model = Model(model1)
         model.set(scale=1e-10)
@@ -33 +36 @@
         
         # What the hell is this line for?
-        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)
@@ -60 +63 @@
         fitter = Fit('scipy')
         # Receives the type of model for the fitting
-        from sans.models.CylinderModel import CylinderModel
         model1  = CylinderModel()
-        model1.setParam('contrast', 1)
-        
+        model1.setParam('sldCyl', 3.0e-6)
+        model1.setParam('sldSolv', 0.0)
+
         # Dispersion parameters
         model1.dispersion['radius']['width'] = 0.001
@@ -74 +77 @@
         model.set(scale=1e-10)
         fitter.set_model(model,1,pars1)
-        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)
@@ -97 +100 @@
         print "TEST DONE WITHOUT PROPER OUTPUT CHECK:"
         print "   ---> TEST NEEDS TO BE COMPLETED"
-        from sans.models.SphereModel import SphereModel
         data = Loader().load("latex_smeared.xml")
         self.data_res = data[0]
@@ -109 +111 @@
         
     def test_reso(self):
-        from DataLoader.qsmearing import smear_selection
-        
+
         # Let the data module find out what smearing the
         # data needs
@@ -123 +124 @@
         # data for a given fit.
         fitter.set_data(self.data_res,1)
-        fitter._engine.fitArrangeDict[1].dList[0].smearer = smear
+        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
         print "smear ",smear
         # Model: maybe there's a better way to do this.
@@ -130 +131 @@
         
         # Why do we have to do this...?
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         
         # Perform the fit (might take a while)
-        result1 = fitter.fit()
+        result1, = fitter.fit()
         
         # Replace this with proper test once we know what the
@@ -141 +142 @@
         
     def test_slit(self):
-        from DataLoader.qsmearing import smear_selection
-        
         smear = smear_selection(self.data_slit)
         self.assertEqual(smear.__class__.__name__, 'SlitSmearer')
@@ -153 +152 @@
         # data for a given fit.
         fitter.set_data(self.data_slit,1)
-        fitter._engine.fitArrangeDict[1].dList[0].smearer = smear
-        fitter._engine.fitArrangeDict[1].dList[0].qmax = 0.003
+        fitter._engine.fit_arrange_dict[1].data_list[0].smearer = smear
+        fitter._engine.fit_arrange_dict[1].data_list[0].qmax = 0.003
         
         # Model
         fitter.set_model(Model(self.sphere),1, ['radius','scale'])
-        fitter.select_problem_for_fit(Uid=1,value=1)
+        fitter.select_problem_for_fit(id=1,value=1)
         
-        result1 = fitter.fit()
+        result1, = fitter.fit()
         
         # Replace this with proper test once we know what the