Changeset d6513cd in sasview for DataLoader/readers

Timestamp:

Aug 22, 2008 5:13:34 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

48882d1

Parents:

533550c

Message:

Data loader update (still working)

File:

• DataLoader/readers/cansas_reader.py (modified) (4 diffs)

DataLoader/readers/cansas_reader.py

@@ -20 +20 @@
 import numpy
 import os, sys
-from DataLoader.data_info import Data1D, Collimation, Detector, Process
+from DataLoader.data_info import Data1D, Collimation, Detector, Process, Aperture
 from xml import xpath
 
@@ -70 +70 @@
                     break
                 
-                if nodes[0].hasAttributes():
-                    for i in range(nodes[0].attributes.length):
-                        attr[nodes[0].attributes.item(i).nodeName] \
-                            = nodes[0].attributes.item(i).nodeValue
+            if nodes[0].hasAttributes():
+                for i in range(nodes[0].attributes.length):
+                    attr[nodes[0].attributes.item(i).nodeName] \
+                        = nodes[0].attributes.item(i).nodeValue
         except:
             # problem reading the node. Skip it and return that
@@ -317 +317 @@
             apert_list = xpath.Evaluate('aperture', item)
             for apert in apert_list:
-                aperture =  collim.Aperture()
-                
+                aperture =  Aperture()
                 _store_float('distance', apert, 'distance', aperture)    
                 _store_float('size/x', apert, 'size.x', aperture)    
@@ -426 +425 @@
         data_info.dx = dx
         data_info.dy = dy
+        
+        data_conv_q = None
+        data_conv_i = None
+        
+        if has_converter == True and data_info.x_unit != '1/A':
+            data_conv_q = Converter('1/A')
+            # Test it
+            data_conv_q(1.0, output.Q_unit)
+            
+        if has_converter == True and data_info.y_unit != '1/cm':
+            data_conv_i = Converter('1/cm')
+            # Test it
+            data_conv_i(1.0, output.I_unit)            
+    
+        
         if data_conv_q is not None:
-            data_info.xaxis("\\rm{Q}", output.x_unit)
+            data_info.xaxis("\\rm{Q}", data_info.x_unit)
         else:
             data_info.xaxis("\\rm{Q}", 'A^{-1}')
         if data_conv_i is not None:
-            data_info.yaxis("\\{I(Q)}", output.y_unit)
+            data_info.yaxis("\\{I(Q)}", data_info.y_unit)
         else:
             data_info.yaxis("\\rm{I(Q)}","cm^{-1}")