r9205 - /1.3/generic_fns/grace.py -- July 13, 2009 - 15:18

Author: bugman
Date: Mon Jul 13 15:18:36 2009
New Revision: 9205

URL: http://svn.gna.org/viewcvs/relax?rev=9205&view=rev
Log:
Bug fixes for the grace.write() user function.


Modified:
    1.3/generic_fns/grace.py

Modified: 1.3/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=9205&r1=9204&r2=9205&view=diff
==============================================================================
--- 1.3/generic_fns/grace.py (original)
+++ 1.3/generic_fns/grace.py Mon Jul 13 15:18:36 2009
@@ -216,14 +216,14 @@
 
             # X-axis conversion factors.
             if x_data_type != 'spin':
-                spin_data[-4] = array(spin_data[-4]) / 
x_return_conversion_factor(x_data_type)
+                spin_data[-4] = array(spin_data[-4]) / 
x_return_conversion_factor(x_data_type, spin)
                 if spin_data[-3]:
-                    spin_data[-3] = array(spin_data[-3]) / 
x_return_conversion_factor(x_data_type)
+                    spin_data[-3] = array(spin_data[-3]) / 
x_return_conversion_factor(x_data_type, spin)
 
             # Y-axis conversion factors.
-            spin_data[-2] = array(spin_data[-2]) / 
y_return_conversion_factor(y_data_type)
+            spin_data[-2] = array(spin_data[-2]) / 
y_return_conversion_factor(y_data_type, spin)
             if spin_data[-1]:
-                spin_data[-1] = array(spin_data[-1]) / 
y_return_conversion_factor(y_data_type)
+                spin_data[-1] = array(spin_data[-1]) / 
y_return_conversion_factor(y_data_type, spin)
 
             # Append the array to the full data structure.
             data.append(spin_data)
@@ -469,7 +469,7 @@
 
     else:
         # Get the units.
-        units = x_return_units(x_data_type)
+        units = x_return_units(x_data_type, spin_id=spin_id)
 
         # Label.
         if units:
@@ -486,7 +486,7 @@
     file.write("@    xaxis  ticklabel char size 1.00\n")
 
     # Y-axis label.
-    units = y_return_units(y_data_type)
+    units = y_return_units(y_data_type, spin_id=spin_id)
     if units:
         file.write("@    yaxis  label \"" + 
y_return_grace_string(y_data_type) + "\\N (" + units + ")\"\n")
     else:
@@ -640,7 +640,7 @@
 
     else:
         # Get the units.
-        units = x_return_units(x_data_type)
+        units = x_return_units(x_data_type, spin_id=spin_id)
 
         # Label.
         if units:
@@ -657,7 +657,7 @@
     file.write("@    xaxis  ticklabel char size 1.00\n")
 
     # Y-axis label.
-    units = y_return_units(y_data_type)
+    units = y_return_units(y_data_type, spin_id=spin_id)
     string = "@    yaxis  label \"" + y_return_grace_string(y_data_type)
     if units:
         string = string + "\\N (" + units + ")"