Changeset de1da34 in sasview

Timestamp:

Mar 10, 2009 7:47:19 AM (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:

148ad64

Parents:

aae8d23

Message:

Added load-ability to get dQ (for smear) if exists, and capability to sort the data by Q as a key

File:

• DataLoader/readers/ascii_reader.py (modified) (5 diffs)

DataLoader/readers/ascii_reader.py

@@ -52 +52 @@
                 y  = numpy.zeros(0)
                 dy = numpy.zeros(0)
-                output = Data1D(x, y, dy=dy)
+                dx = numpy.zeros(0)
+                
+               #temp. space to sort data
+                tx  = numpy.zeros(0)
+                ty  = numpy.zeros(0)
+                tdy = numpy.zeros(0)
+                tdx = numpy.zeros(0)
+                
+                output = Data1D(x, y, dy=dy, dx=dx)
                 self.filename = output.filename = basename
            
@@ -71 +79 @@
                 # The first good line of data will define whether
                 # we have 2-column or 3-column ascii
-                has_error = None
+                has_error_dx = None
+                has_error_dy = None
                 
                 for line in lines:
@@ -102 +111 @@
                         # If we haven't set the 3rd column
                         # flag, set it now.
-                        if has_error == None:
-                            has_error = False if _dy == None else True
+                        if has_error_dy == None:
+                            has_error_dy = False if _dy == None else True
+                            
+                        #Check for dx
+                        _dx = None
+                        if len(toks)>3:
+                            try:
+                                _dx = float(toks[3])
+                                
+                                if data_conv_i is not None:
+                                    _dx = data_conv_i(_dx, units=output.x_unit)
+                                
+                            except:
+                                # The 4th column is not a float, skip it.
+                                pass
+                            
+                        # If we haven't set the 3rd column
+                        # flag, set it now.
+                        if has_error_dx == None:
+                            has_error_dx = False if _dx == None else True
 
                         x  = numpy.append(x,   _x) 
                         y  = numpy.append(y,   _y)
-                        if has_error == True:
+                        if has_error_dy == True:
                             dy = numpy.append(dy, _dy)
+                        if has_error_dx == True:
+                            dx = numpy.append(dx, _dx)
+                            
+                        #Same for temp.
+                        tx  = numpy.append(tx,   _x) 
+                        ty  = numpy.append(ty,   _y)
+                        if has_error_dy == True:
+                            tdy = numpy.append(tdy, _dy)
+                        if has_error_dx == True:
+                            tdx = numpy.append(tdx, _dx)
                         
                     except:
@@ -116 +153 @@
                      
                 # Sanity check
-                if has_error == True and not len(y) == len(dy):
+                if has_error_dy == True and not len(y) == len(dy):
+                    raise RuntimeError, "ascii_reader: y and dy have different length"
+                if has_error_dx == True and not len(x) == len(dx):
                     raise RuntimeError, "ascii_reader: y and dy have different length"
 
@@ -123 +162 @@
                 if len(x)==0:
                     raise RuntimeError, "ascii_reader: could not load file"
-               
+                
+                #Let's reoder the data
+                ind = numpy.lexsort((ty,tx))
+                for i in ind:
+                    x[i] = tx[ind[i]]
+                    y[i] = ty[ind[i]]
+                    if has_error_dy == True:
+                        dy[i] = tdy[ind[i]]
+                    if has_error_dx == True:
+                        dx[i] = tdx[ind[i]]
+                    
                 output.x = x
                 output.y = y
-                output.dy = dy if has_error == True else None
+                output.dy = dy if has_error_dy == True else None
+                output.dx = dx if has_error_dx == True else None
+                
                 if data_conv_q is not None:
                     output.xaxis("\\rm{Q}", output.x_unit)