Changeset d53bc33 in sasview for park_integration

Timestamp:

Aug 6, 2008 2:52:15 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:

a9dec92

Parents:

129284a

Message:

add test fitting data 3 times

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• test/cyl_testdata1.txt (added)
• test/test_large_model.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -46 +46 @@
             
         """
-        print "fitting parmater",pars
+        print "AbstractFitEngine:  fitting parmater",pars
         temp=[]
         if pars !={}:
@@ -60 +60 @@
                     temp.append(key)
             self.paramList.append(temp)
-            print "self.paramList2", self.paramList
+            print "AbstractFitEngine: self.paramList2", self.paramList
             #A fitArrange is already created but contains dList only at Uid
             if self.fitArrangeList.has_key(Uid):

park_integration/test/test_large_model.py

@@ -10 +10 @@
     """ test fitting """
     def testfit_1Data_1Model(self):
+        """ test fitting for one data and one model park vs scipy"""
+        #load data
+        from sans.fit.Loader import Load
+        load= Load()
+        load.set_filename("cyl_testdata.txt")
+        load.set_values()
+        data1 = Data1D(x=[], y=[],dx=None, dy=None)
+        load.load_data(data1)
+       
+        
+        #Importing the Fit module
+        from sans.fit.Fitting import Fit
+        fitter= Fit('scipy')
+        
+        # Receives the type of model for the fitting
+        from sans.models.CylinderModel import CylinderModel
+        model1  = CylinderModel()
+      
+        
+        #Do the fit SCIPY
+        fitter.set_data(data1,1)
+        import math
+        pars1={'background':0,'contrast':3*math.pow(10, -6),\
+                'cyl_phi':1,'cyl_theta':1,'length':400,'radius':20,'scale':1}
+        fitter.set_model(model1,"M1",1,pars1)
+       
+        
+        chisqr1, out1, cov1=fitter.fit()
+        print "scipy1",chisqr1, out1, cov1
+        pars2={'background':1.0,'contrast':400,\
+                'cyl_phi':20,'cyl_theta':0.0,'length':1.0,\
+                'radius':3*math.pow(10, -6),'scale':1.0}
+        fitter.set_model(model1,"M1",1,pars2)
+        chisqr2, out2, cov2=fitter.fit()
+        print "scipy2",chisqr2, out2, cov2
+        
+        pars3={'background':5.85693826,'contrast': 5.86071451,\
+                'cyl_phi':1.04547760*math.pow(10,-5),'cyl_theta':1.0,'length':0.0,\
+                'radius':1.39397013*math.pow(10, 3),'scale':20}
+        fitter.set_model(model1,"M1",1,pars3)
+        chisqr3, out3, cov3=fitter.fit()
+        print "scipy3",chisqr3, out3, cov3
+        self.assert_(chisqr1)
+        
+       
+      
+    def testfit_11Data_1Model(self):
         """ test fitting for one data and one model park vs scipy"""
         #load data