Changeset fb7180c in sasview for test

Timestamp:

May 7, 2014 4:50:18 PM (11 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:

e544c84

Parents:

f121904

Message:

enable park constrained fit test

File:

• test/park_integration/test/utest_fit_cylinder.py (moved) (moved from test/park_integration/test/test_fit_cylinder.py) (2 diffs)

test/park_integration/test/utest_fit_cylinder.py

@@ -100 +100 @@
         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'])
@@ -110 +110 @@
     def test_park2(self):
         """ Simultaneous cylinder model fit (park)  """
-        raise NotImplementedError()
-        result1,= self._fit('park')
+        result1, result2 = self._fit('park')
         self.assert_(result1)
-        self.assertTrue(len(result1.pvec)>=0  )
-        self.assertTrue(len(result1.stderr)>= 0)
-      
-        for par in result1.parameters:
-            if par.name=='C1.length':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-400.0)/3.0 < par.stderr )
-            elif par.name=='C1.radius':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-20.0)/3.0 < par.stderr )
-            elif par.name=='C2.radius':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-40.0)/3.0 < par.stderr )
-            elif par.name=='C1.scale':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
-            elif par.name=='C2.scale':
-                print par.name, par.value
-                self.assertTrue( math.fabs(par.value-1.0)/3.0 < par.stderr )
-            
+        self.assertTrue(len(result1.pvec)>0)
+        self.assertTrue(len(result1.stderr)>0)
+
+        for n, v, dv in zip(result1.param_list, result1.pvec, result1.stderr):
+            print "M1.%s = %s +/- %s"%(n,v,dv)
+            if n == "length":
+                self.assertTrue( math.fabs(v-400.0)/3.0 < dv )
+            elif n=='radius':
+                self.assertTrue( math.fabs(v-20.0)/3.0 < dv )
+            elif n=='scale':
+                self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
+        for n, v, dv in zip(result2.param_list, result2.pvec, result2.stderr):
+            print "M2.%s = %s +/- %s"%(n,v,dv)
+            if n=='radius':
+                self.assertTrue( math.fabs(v-40.0)/3.0 < dv )
+            elif n=='scale':
+                self.assertTrue( math.fabs(v-1.0)/3.0 < dv )
+
 
 if __name__ == '__main__':