Changeset e3efa6b3 in sasview for test/park_integration/test/utest_fit_cylinder.py

Timestamp:

May 15, 2014 11:23:22 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:

4e9f227

Parents:

76f132a

Message:

restructure bumps wrapper and add levenberg-marquardt

File:

• test/park_integration/test/utest_fit_cylinder.py (modified) (2 diffs)

test/park_integration/test/utest_fit_cylinder.py

@@ -95 +95 @@
         self.model2.set(background=0.0)
        
-    def _fit(self, name="park"):
-        """ return fit result """
-        fitter = Fit(name)
-        fitter.set_data(self.data1,1)
-        fitter.set_model(self.model1, 1, ['length','radius','scale'])
 
-        fitter.set_data(self.data2,2)
-        fitter.set_model(self.model2, 2, ['radius','scale'])
-        fitter.select_problem_for_fit(id=1,value=1)
-        fitter.select_problem_for_fit(id=2,value=1)
-        return fitter.fit()
-    
-    
     def test_park2(self):
         """ Simultaneous cylinder model fit (park)  """
-        result1, result2 = self._fit('park')
+        self._run_fit(Fit('park'))
+
+    def _run_fit(self, fitter):
+        result1, result2 = self._fit(fitter)
         self.assert_(result1)
         self.assertTrue(len(result1.pvec)>0)
@@ -130 +121 @@
                 self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
 
+    def _fit(self, fitter):
+        """ return fit result """
+        fitter.set_data(self.data1,1)
+        fitter.set_model(self.model1, 1, ['length','radius','scale'])
+
+        fitter.set_data(self.data2,2)
+        fitter.set_model(self.model2, 2, ['radius','scale'])
+        fitter.select_problem_for_fit(id=1,value=1)
+        fitter.select_problem_for_fit(id=2,value=1)
+        return fitter.fit()
+
 
 if __name__ == '__main__':