Changeset a644dc4 in sasview

Timestamp:

Nov 21, 2008 9:23:43 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:

7a7bf55

Parents:

b5847bd8

Message:

fixing fitting with add_error

Location:

guiframe

Files:

• dataFitting.py (modified) (1 diff)
• data_loader.py (modified) (1 diff)

guiframe/dataFitting.py

@@ -16 +16 @@
 class Theory1D(plotTheory1D,DataInfo):
     def __init__(self,x=[],y=[],dy=None,dxl=None, dxw=None):
-        Theory1D.__init__(self, x, y, dx)
+        plotTheory1D.__init__(self, x, y)
         self.smearer=None
         if dxl !=None:

guiframe/data_loader.py

@@ -94 +94 @@
             #print "data_loader",output
         else:
-            if not hasattr(output,"dy"):
+            print "output.dx, output.dy",output.dx, output.dy,len(output.dy)
+            if len(output.dy) ==0 :
+                print "went here theory1D"
                 new_plot = Theory1D(output.x,output.y, dxl, dxw)
             else: