Changeset 5fcfca4 in sasview

Timestamp:

Nov 18, 2008 9:59:37 AM (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:

61cb28d

Parents:

55e13ab

Message:

smearing added

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (1 diff)
• Fitting.py (modified) (1 diff)
• ScipyFitting.py (modified) (1 diff)
• test/test_fit_cylinder.py (modified) (1 diff)
• test/test_fit_line.py (modified) (1 diff)
• test/test_fit_smeared.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -191 +191 @@
         """
         ## Smearing object
-        self.smearer = None
+        self.smearer = sans_data1d.smearer
 
         # Initialize from Data1D object

park_integration/Fitting.py

@@ -4 +4 @@
     a park fit or a scipy fit.
 """
-from sans.guitools.plottables import Data1D
+#from sans.guitools.plottables import Data1D
+from danse.common.plottools.plottables import Data1D
 from Loader import Load
 from scipy import optimize

park_integration/ScipyFitting.py

@@ -6 +6 @@
 #import scipy.linalg
 import numpy 
-from sans.guitools.plottables import Data1D
+#from sans.guitools.plottables import Data1D
+from danse.common.plottools.plottables import Data1D
 from Loader import Load
 from scipy import optimize

park_integration/test/test_fit_cylinder.py

@@ -3 +3 @@
 """
 import unittest
-from sans.guitools.plottables import Theory1D
-from sans.guitools.plottables import Data1D
+#from sans.guitools.plottables import Theory1D
+#from sans.guitools.plottables import Data1D
+from danse.common.plottools.plottables import Data1D,Theory1D
 from sans.fit.AbstractFitEngine import Data, Model,FitData1D
 import math

park_integration/test/test_fit_line.py

@@ -3 +3 @@
 """
 import unittest
-from sans.guitools.plottables import Theory1D
-from sans.guitools.plottables import Data1D
+#from sans.guitools.plottables import Theory1D
+#from sans.guitools.plottables import Data1D
+from danse.common.plottools.plottables import Data1D,Theory1D
 from sans.fit.AbstractFitEngine import Data, Model,FitData1D
 import math

park_integration/test/test_fit_smeared.py

@@ -123 +123 @@
         fitter.set_data(self.data_res,1)
         fitter._engine.fitArrangeDict[1].dList[0].smearer = smear
-        
+        print "smear ",smear
         # Model: maybe there's a better way to do this.
         # Ideally we should have to create a new model from our sans model.