Changeset 1ea3488 in sasview

Timestamp:

Oct 19, 2009 10:16:00 AM (15 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:

6244c2c

Parents:

dd2c2ea3

Message:

remove unsused data class

Location:

park_integration/test

Files:

• small_test.py (modified) (2 diffs)
• test_fit_cylinder.py (modified) (1 diff)
• test_fit_line.py (modified) (1 diff)
• test_park_scipy.py (modified) (1 diff)

park_integration/test/small_test.py

@@ -3 +3 @@
 """
 import unittest
-from sans.guitools.plottables import Theory1D
-from sans.guitools.plottables import Data1D
-from sans.fit.AbstractFitEngine import Data, Model,FitData1D
+from danse.common.plottools.plottables import Theory1D
+from danse.common.plottools.plottables import Data1D
+from sans.fit.AbstractFitEngine import Model,FitData1D
 import math
 from sans.fit.Fitting import Fit
@@ -18 +18 @@
         data1 = Data1D(x=out.x, y=out.y, dx=out.dx, dy=out.y)
         
-        fitter = Fit('park')
+        fitter = Fit('scipy')
         # Receives the type of model for the fitting
         from sans.models.CylinderModel import CylinderModel

park_integration/test/test_fit_cylinder.py

@@ -6 +6 @@
 #from sans.guitools.plottables import Data1D
 from danse.common.plottools.plottables import Data1D,Theory1D
-from sans.fit.AbstractFitEngine import Data, Model,FitData1D
+from sans.fit.AbstractFitEngine import Model,FitData1D
 import math
 from sans.fit.Fitting import Fit

park_integration/test/test_fit_line.py

@@ -6 +6 @@
 #from sans.guitools.plottables import Data1D
 from danse.common.plottools.plottables import Data1D,Theory1D
-from sans.fit.AbstractFitEngine import Data, Model,FitData1D
+from sans.fit.AbstractFitEngine import Model,FitData1D
 import math
 class testFitModule(unittest.TestCase):

park_integration/test/test_park_scipy.py

@@ -5 +5 @@
 
 from sans.guiframe.dataFitting import Data1D 
-from sans.fit.AbstractFitEngine import Data, Model,FitData1D
+from sans.fit.AbstractFitEngine import Model,FitData1D
 import math
 from sans.fit.Fitting import Fit