Changes in src/sas/sascalc/dataloader/readers/danse_reader.py [9a5097c:463e7ffc] in sasview

File:

• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (5 diffs)

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

@@ -15 +15 @@
 import os
 import sys
-import numpy as np
+import numpy
 import logging
 from sas.sascalc.dataloader.data_info import Data2D, Detector
 from sas.sascalc.dataloader.manipulations import reader2D_converter
+
+logger = logging.getLogger(__name__)
 
 # Look for unit converter
@@ -79 +81 @@
             output.detector.append(detector)
             
-            output.data = np.zeros([size_x,size_y])
-            output.err_data = np.zeros([size_x, size_y])
+            output.data = numpy.zeros([size_x,size_y])
+            output.err_data = numpy.zeros([size_x, size_y])
             
             data_conv_q = None
@@ -142 +144 @@
                             error.append(err)
                         except:
-                            logging.info("Skipping line:%s,%s" %(data_str,
+                            logger.info("Skipping line:%s,%s" %(data_str,
                                                                 sys.exc_value))
             
@@ -196 +198 @@
                     msg = "Skipping entry (v1.0):%s,%s" % (str(data[i_pt]),
                                                            sys.exc_value)
-                    logging.info(msg)
+                    logger.info(msg)
                 
                 # Get bin number
@@ -271 +273 @@
                 raise ValueError, msg
             else:
-                logging.info("Danse_reader Reading %s \n" % filename)
+                logger.info("Danse_reader Reading %s \n" % filename)
             
             # Store loading process information