Changeset 52ac10b in sasview

Timestamp:

Nov 19, 2008 10:26:45 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:

b5847bd8

Parents:

b710eb7

Message:

try except added to get the smearer , sans.guitools.linemodel removed

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (1 diff)
• test/test_fit_line.py (modified) (4 diffs)

park_integration/AbstractFitEngine.py

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

park_integration/test/test_fit_line.py

@@ -19 +19 @@
         fitter = Fit('scipy')
         # Receives the type of model for the fitting
-        from sans.guitools.LineModel import LineModel
+        from sans.models.LineModel import LineModel
         model1  = LineModel()
         model1.name = "M1"
         #data = Data(sans_data=data1 )
-        data1.smearer=None
+        #data1.smearer=None
         data = FitData1D(data1 )
         model = Model(model1)
@@ -83 +83 @@
         fitter = Fit('scipy')
         # Receives the type of model for the fitting
-        from sans.guitools.LineModel import LineModel
+        from sans.models.LineModel import LineModel
         model11  = LineModel()
         model11.name= "M1"
@@ -147 +147 @@
         fitter = Fit('park')
         # Receives the type of model for the fitting
-        from sans.guitools.LineModel import LineModel
+        from sans.models.LineModel import LineModel
         from sans.models.Constant import Constant
         model11  = LineModel()
@@ -199 +199 @@
         fitter = Fit('scipy')
         # Receives the type of model for the fitting
-        from sans.guitools.LineModel import LineModel
+        from sans.models.LineModel import LineModel
         model1  = LineModel()
         model1.name= "M1"