Changeset eadf1f9 in sasview

Timestamp:

Mar 12, 2010 12:34:49 PM (15 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:

3cd95c8

Parents:

ded62ce

Message:

added calling qmap converter

Location:

DataLoader/readers

Files:

• IgorReader.py (modified) (3 diffs)
• danse_reader.py (modified) (2 diffs)

DataLoader/readers/IgorReader.py

@@ -21 +21 @@
 import math, logging
 from DataLoader.data_info import Data2D, Detector
+from DataLoader.manipulations import reader2D_converter
 
 # Look for unit converter
@@ -151 +152 @@
                 isCenter = False                
                 line_toks = line.split()
-                # Center in bin number
-                center_x = float(line_toks[0])
-                center_y = float(line_toks[1])
+                
+                # Center in bin number: Must substrate 1 because the index starts from 1
+                center_x = float(line_toks[0])-1
+                center_y = float(line_toks[1])-1
 
             if line.count("BCENT")>0:
@@ -292 +294 @@
         # Store loading process information
         output.meta_data['loader'] = self.type_name
+        output = reader2D_converter(output)
+
         return output
     

DataLoader/readers/danse_reader.py

@@ -23 +23 @@
 import logging
 from DataLoader.data_info import Data2D, Detector
+from DataLoader.manipulations import reader2D_converter
 
 # Look for unit converter
@@ -278 +279 @@
             # Store loading process information
             output.meta_data['loader'] = self.type_name    
+            output = reader2D_converter(output)
             return output