@@ -104,7 +104,7 @@ def guinier_residuals(param, i, q): err = i-guinier(q, param) return err -#Least squares fitting routine for Guinier + def fit_guinier(data): """Function for calling to get a Guinier fit to a dataset @@ -200,7 +200,10 @@ class TestAnalysis(unittest.TestCase): test_data = SasData((arange(0,3,0.001)), (arange(4,1,-0.001))) - test_params = [5., 20., 2.] + i0 = 5. + Rg= 20. + background = 2. + test_params = [i0, Rg, background] test_guinier = [] # use guinier to make list to test @@ -210,8 +213,8 @@ class TestAnalysis(unittest.TestCase): self.assertEqual(len(test_guinier), len(test_data)) # test that guinier is returning the right numbers at extremes - self.assertEqual(test_guinier[0], 7) - self.assertEqual(test_guinier[-1], 2) + self.assertEqual(test_guinier[0], (i0+background)) + self.assertEqual(test_guinier[-1], background) self.assertRaises(AssertionError, guinier, test_data.q, []) self.assertRaises(AssertionError, guinier, [], test_params) @@ -227,6 +230,14 @@ class TestAnalysis(unittest.TestCase): test_params, test_zeros, test_data.q) self.assertEqual(test_residuals[46], (-1*(test_guinier[46]))) + # testing the fitting function to some faked data + test_fit = SasData(test_data.q, test_guinier) + + test_outs = fit_guinier(test_fit) + self.assertEqual(test_outs[0][0],i0) + self.assertEqual(test_outs[0][1],Rg) + self.assertEqual(test_outs[0][2], background) + if __name__ == '__main__': sas.py b5c41ab7784b7bf00d3f59f036ecaee36d8cb903 Cameron Neylon cameronneylon cameron.neylon@stfc.ac.uk http://github.com/cameronneylon/sas/commit/764654e9f4af034bcca8d3c01b6f6f090cbe0005 764654e9f4af034bcca8d3c01b6f6f090cbe0005 2009-03-03T13:20:42-08:00 2009-03-03T13:20:42-08:00 Added tests for guinier fitting function - all currently good 2cc34a3b71b235c5931b287afa43b30386d14f05 Cameron Neylon cameronneylon cameron.neylon@stfc.ac.uk