Changeset 7d0c1a8 in sasview for park_integration/test

Timestamp:

Oct 9, 2008 2:33:14 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:

385d464

Parents:

fb8d4050

Message:

introduced fitdata1D and fitdata2D class instead of Data class.

File:

• park_integration/test/test_fit_line.py (modified) (5 diffs)

park_integration/test/test_fit_line.py

@@ -5 +5 @@
 from sans.guitools.plottables import Theory1D
 from sans.guitools.plottables import Data1D
-from sans.fit.AbstractFitEngine import Data, Model
+from sans.fit.AbstractFitEngine import Data, Model,FitData1D
 import math
 class testFitModule(unittest.TestCase):
@@ -21 +21 @@
         model1  = LineModel()
         model1.name = "M1"
-        data = Data(sans_data=data1 )
+        #data = Data(sans_data=data1 )
+        data = FitData1D(data1 )
         model = Model(model1)
         #fit with scipy test
@@ -85 +86 @@
         model22  = LineModel()
         model11.name= "M2"
-        data1 = Data(sans_data=data11 )
-        data2 = Data(sans_data=data22 )
+        #data1 = Data(sans_data=data11 )
+        #data2 = Data(sans_data=data22 )
+        data1 = FitData1D(data11 )
+        data2 = FitData1D(data22 )
+        
         model1 = Model(model11)
         model2 = Model(model22)
@@ -150 +154 @@
         # Constrain the constant value to be equal to parameter B (the real value is 2.5)
         
-        
-        data1 = Data(sans_data=data11 )
-        data2 = Data(sans_data=data22 )
+        #data1 = Data(sans_data=data11 )
+        #data2 = Data(sans_data=data22 )
+        
+        data1 = FitData1D(data11 )
+        data2 = FitData1D(data22 )
         model1 = Model(model11)
         model2 = Model(model22)
@@ -194 +200 @@
         model1.name= "M1"
       
-        data1 = Data(sans_data=data11 )
-        data2 = Data(sans_data=data22 )
+        #data1 = Data(sans_data=data11 )
+        #data2 = Data(sans_data=data22 )
+        data1 = FitData1D(data11 )
+        data2 = FitData1D(data22 )
         model = Model(model1)