Changeset fa5908de in sasview for park_integration

Timestamp:

Sep 12, 2008 5:17:13 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:

1ed9c57

Parents:

4fc6dbf

Message:

more testing lorentzian model

File:

• park_integration/test/testnewscipy.py (modified) (3 diffs)

park_integration/test/testnewscipy.py

@@ -15 +15 @@
         from sans.fit.Loader import Load
         load= Load()
-        load.set_filename("testdata_line.txt")
+        load.set_filename("cyl_testdata.txt")
         load.set_values()
         data11 = Data1D(x=[], y=[],dx=None, dy=None)
@@ -25 +25 @@
         
         # Receives the type of model for the fitting
-        from sans.guitools.LineModel import LineModel
-        model1  = LineModel()
+        from sans.models.Lorentzian import Lorentzian
+        model1  = Lorentzian()
         data1=Data(sans_data=data11)
         model =Model(model1)
         #Do the fit SCIPY
-       
+        pars1=['center','gamma','scale']
         fitter.set_data(data1,1)
-        fitter.set_model(model,"M1",1,['A','B'])
-    
+        fitter.set_model(model,"M1",1,pars1)
+        
         result=fitter.fit()
-        print "park",result.pvec,
+        print "park1",result.pvec,result.fitness,result.cov
         
         self.assert_(result)
@@ -71 +71 @@
       
         result=fitter.fit()
-        print "park",result.fitness,result.cov, result.pvec
+        print "park2",result.fitness,result.cov, result.pvec
         self.assert_(result.fitness)