Changeset 202f93a in sasview for park_integration/test

Timestamp:

Jul 18, 2008 1:54:23 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

acb1ad1

Parents:

75b40ce

Message:

fixing fit , only fit parameters newly set in model

File:

• park_integration/test/constrainttestpark.py (modified) (1 diff)

park_integration/test/constrainttestpark.py

@@ -52 +52 @@
         #self.assert_(chisqr2/len(data1.x) < 2)
         #self.assert_(chisqr2/len(data2.x) < 2)
+    def testmodel1data1param1(self):
+        """ test fitting for two set of data  and one model with 2 constraint"""
+        from sans.fit.Loader import Load
+        load= Load()
+        #Load the first set of data
+        load.set_filename("testdata1.txt")
+        load.set_values()
+        data1 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data1)
         
+        #Load the second set of data
+        load.set_filename("testdata2.txt")
+        load.set_values()
+        data2 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data2)
+        
+        #Importing the Fit module
+        from sans.fit.Fitting import Fit
+        fitter= Fit('park')
+        # Receives the type of model for the fitting
+        from sans.guitools.LineModel import LineModel
+        model1  = LineModel()
+       
+        
+        #Do the fit
+        
+        fitter.set_model(model1,"M1",1, {'A':1})
+        fitter.set_data(data1,1)
+       
+     
+        
+        chisqr2, out2, cov2 = fitter.fit()
+        print "chisqr2",chisqr2
+        print "out2", out2
+        print " cov2", cov2
+        print chisqr2/len(data1.x)
+        
+        self.assert_(math.fabs(out2[1]-2.5)/math.sqrt(cov2[1][1]) < 2)
+        self.assert_(math.fabs(out2[0]-4.0)/math.sqrt(cov2[0][0]) < 2)
+        #self.assert_(chisqr2/len(data1.x) < 2)
+        #self.assert_(chisqr2/len(data2.x) < 2)
+