Changeset 385d464 in sasview for park_integration

Timestamp:

Oct 9, 2008 2:36:42 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:

6f73a08

Parents:

7d0c1a8

Message:

modified tests

Location:

park_integration/test

Files:

• small_test.py (modified) (2 diffs)
• test_fit_cylinder.py (modified) (5 diffs)

park_integration/test/small_test.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
 from sans.fit.Fitting import Fit
@@ -23 +23 @@
         model1  = CylinderModel()
         model1.setParam('contrast', 1)
-        data = Data(sans_data=data1)
+        #data = Data(sans_data=data1)
+        data = FitData1D(data1)
         model = Model(model1)
         

park_integration/test/test_fit_cylinder.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
 from sans.fit.Fitting import Fit
@@ -24 +24 @@
         model1  = CylinderModel()
         model1.setParam('contrast', 1)
-        data = Data(sans_data=data1)
+        #data = Data(sans_data=data1)
+        data = FitData1D(data1)
         model = Model(model1)
         
@@ -54 +55 @@
         model1  = CylinderModel()
         
-        data = Data(sans_data=data1)
+        #data = Data(sans_data=data1)
+        data = FitData1D(data1)
         model = Model(model1)
         
@@ -91 +93 @@
         cyl1.name = "C1"
         
-        data1 = Data(sans_data=data1)
+        #data1 = Data(sans_data=data1)
+        data1 = FitData1D(data1)
         model1 = Model(cyl1)
         model1.set(contrast=1)
@@ -101 +104 @@
         cyl2.name = "C2"
         
-        data2 = Data(sans_data=data2)
+        #data2 = Data(sans_data=data2)
+        data2 = FitData1D(data2)
         # This is wrong. We should not store string as 
         # parameter values