Changeset dd11014 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Apr 4, 2017 1:00:50 PM (8 years ago)

Author:

ajj

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990, a2e980b, 4b81e01, 3a33740

Parents:

1779e72

Message:

Fixing PR #55 broken merge

File:

• src/sas/sascalc/dataloader/readers/IgorReader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/IgorReader.py

@@ -14 +14 @@
 import os
 
-import numpy as np
-import math
-#import logging
-
 from sas.sascalc.dataloader.data_info import Data2D
 from sas.sascalc.dataloader.data_info import Detector
 from sas.sascalc.dataloader.manipulations import reader2D_converter
+import numpy as np
 
 # Look for unit converter
@@ -65 +62 @@
             data_conv_i(1.0, output.I_unit)
 
-        for line in lines:
-            
-            # Find setup info line
-            if isInfo:
-                isInfo = False
-                line_toks = line.split()
-                # Wavelength in Angstrom
-                try:
-                    wavelength = float(line_toks[1])
-                except:
-                    msg = "IgorReader: can't read this file, missing wavelength"
-                    raise ValueError, msg
-                
-            #Find # of bins in a row assuming the detector is square.
-            if dataStarted == True:
-                try:
-                    value = float(line)
-                except:
-                    # Found a non-float entry, skip it
-                    continue
-                
-                # Get total bin number
-                
-            i_tot_row += 1
-        i_tot_row = math.ceil(math.sqrt(i_tot_row)) - 1
-        #print "i_tot", i_tot_row
-        size_x = i_tot_row  # 192#128
-        size_y = i_tot_row  # 192#128
-        output.data = np.zeros([size_x, size_y])
-        output.err_data = np.zeros([size_x, size_y])
-  
         data_row = 0
         wavelength = distance = center_x = center_y = None