Changeset bc3dd65d in sasview

Timestamp:

Mar 10, 2009 4:48:55 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

914a499

Parents:

21d2eb0

Message:

Added dx (dQ) to read from data file if exists

File:

• guiframe/data_loader.py (modified) (6 diffs)

guiframe/data_loader.py

@@ -33 +33 @@
         file_y = numpy.zeros(0)
         file_dy = numpy.zeros(0)
+        file_dx = numpy.zeros(0)
         
         input_f = open(path,'r')
@@ -39 +40 @@
         
         has_dy = False
+        has_dx = False
         
         for line in lines:
@@ -47 +49 @@
                 if len(toks)==3:
                     has_dy = True
-                    err = float(toks[2])
+                    errdy = float(toks[2])
                 else:
-                    err = 0.0
+                    errdy = 0.0
+                if len(toks)==4:
+                    has_dx = True
+                    errdx = float(toks[3])
+                else:
+                    errdx = 0.0
                 file_x  = numpy.append(file_x, x)
                 file_y  = numpy.append(file_y, y)
-                file_dy = numpy.append(file_dy, err)
+                file_dy = numpy.append(file_dy, dyerr)
+                file_dx = numpy.append(file_dx, dxerr)
             except:
                 print "READ ERROR", line
@@ -58 +66 @@
         if has_dy==False:
             file_dy = None
+        if has_dx==False:
+            file_dx = None
             
-        return file_x, file_y, file_dy
+        return file_x, file_y, file_dy, file_dx
     return None, None, None
 
@@ -147 +157 @@
         for item in output:
             try:
+                dx=item.dx
                 dxl=item.dxl
                 dxw=item.dxw
             except:
+                dx=None
                 dxl=None
                 dxw=None
@@ -156 +168 @@
                 new_plot = Theory1D(item.x,item.y,dxl,dxw)
             else:
-                new_plot = Data1D(x=item.x,y=item.y,dx=item.dx,dy=item.dy,dxl=dxl,dxw=dxw)
+                new_plot = Data1D(x=item.x,y=item.y,dx=dx,dy=item.dy,dxl=dxl,dxw=dxw)
            
             new_plot.source=item.source