Changeset eeaabb1 in sasview for DataLoader/readers/danse_reader.py

Timestamp:

Feb 9, 2009 12:51:36 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:

c5f0337

Parents:

2bc8d4a

Message:

The titles and units on 2d plots are corrected.

File:

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

DataLoader/readers/danse_reader.py

@@ -87 +87 @@
             data_conv_i = None
             
-            if has_converter == True and output.Q_unit != '1/A':
-                data_conv_q = Converter('1/A')
+            if has_converter == True and output.Q_unit != 'A^{-1}':
+                data_conv_q = Converter('A^{-1}')
                 # Test it
                 data_conv_q(1.0, output.Q_unit)
                 
-            if has_converter == True and output.I_unit != '1/cm':
-                data_conv_i = Converter('1/cm')
+            if has_converter == True and output.I_unit != 'cm^{-1}':
+                data_conv_i = Converter('cm^{-1}')
                 # Test it
                 data_conv_i(1.0, output.I_unit)            
@@ -161 +161 @@
                 qx = 4.0*math.pi/wavelength * math.sin(theta/2.0)
                 
-                if has_converter == True and output.Q_unit != '1/A':
+                if has_converter == True and output.Q_unit != 'A^{-1}':
                     qx = data_conv_q(qx, units=output.Q_unit)
                 
                 x_vals.append(qx)
-                if xmin==None or qx<xmin:
+                if xmin==None or qx<=xmin:
                     xmin = qx
-                if xmax==None or qx>xmax:
+                if xmax==None or qx>=xmax:
                     xmax = qx
             
@@ -176 +176 @@
                 qy = 4.0*math.pi/wavelength * math.sin(theta/2.0)
                 
-                if has_converter == True and output.Q_unit != '1/A':
+                if has_converter == True and output.Q_unit != 'A^{-1}':
                     qy = data_conv_q(qy, units=output.Q_unit)
                 
@@ -242 +242 @@
             ymax    =ymax+stepq/2.0
             
-            if has_converter == True and output.Q_unit != '1/A':
+            if has_converter == True and output.Q_unit != 'A^{-1}':
                 xmin = data_conv_q(xmin, units=output.Q_unit)
                 xmax = data_conv_q(xmax, units=output.Q_unit)
@@ -258 +258 @@
             # Units
             if data_conv_q is not None:
-                output.xaxis("\\rm{Q}", output.Q_unit)
-                output.yaxis("\\rm{Q}", output.Q_unit)
-            else:
-                output.xaxis("\\rm{Q}", 'A^{-1}')
-                output.yaxis("\\rm{Q}", 'A^{-1}')
+                output.xaxis("\\rm{Q_{x}}", output.Q_unit)
+                output.yaxis("\\rm{Q_{y}}", output.Q_unit)
+            else:
+                output.xaxis("\\rm{Q_{x}}", 'A^{-1}')
+                output.yaxis("\\rm{Q_{y}}", 'A^{-1}')
                 
             if data_conv_i is not None: