Changeset 7705306 in sasview

Timestamp:

Jun 20, 2008 1:43:12 PM (17 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:

559cd63

Parents:

fbe6f71

Message:

UML diagram modified

Location:

park_integration

Files:

• Fitting.py (added)
• Loader.py (added)
• ParkFitting.py (added)
• ScipyFitting.py (added)
• __init__.py (added)
• docs/park_integration2.vsd (added)
• test/testfitting.py (modified) (6 diffs)
• testdata_generator.py (added)

park_integration/test/testfitting.py

@@ -5 +5 @@
 from sans.guitools.plottables import Theory1D
 from sans.guitools.plottables import Data1D
-from FittingModule import Parameter
+from sans.fit.ScipyFitting import Parameter
 import math
 class testFitModule(unittest.TestCase):
@@ -13 +13 @@
             test module Load
         """
-        from Loader import Load
+        from sans.fit.Loader import Load
         load= Load()
         
@@ -55 +55 @@
         """ test fitting for one data and one model"""
         #load data
-        from Loader import Load
+        from sans.fit.Loader import Load
         load= Load()
         load.set_filename("testdata_line.txt")
@@ -63 +63 @@
         
         #Importing the Fit module
-        from Fitting import Fit
+        from sans.fit.Fitting import Fit
         fitter= Fit()
         fitter.fit_engine('scipy')
@@ -104 +104 @@
     def testfit_2Data_1Model(self):
         """ test fitting for two set of data  and one model"""
-        from Loader import Load
+        from sans.fit.Loader import Load
         load= Load()
         #Load the first set of data
@@ -119 +119 @@
        
         #Importing the Fit module
-        from Fitting import Fit
+        from sans.fit.Fitting import Fit
         fitter= Fit()
         # Receives the type of model for the fitting