r16516 - /branches/uf_redesign/generic_fns/grace.py -- May 29, 2012 - 16:17

Author: bugman
Date: Tue May 29 16:17:32 2012
New Revision: 16516

URL: http://svn.gna.org/viewcvs/relax?rev=16516&view=rev
Log:
Fix for the grace.write user function backend for the changes in the specific 
API param lists.

The specific API return_conversion_factor() method will now raise a 
RelaxError if the missing 'spin'
object is asked for whereas previously this would return 1.0 for all 
unknowns.  This changes handles
the new behaviour.


Modified:
    branches/uf_redesign/generic_fns/grace.py

Modified: branches/uf_redesign/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/generic_fns/grace.py?rev=16516&r1=16515&r2=16516&view=diff
==============================================================================
--- branches/uf_redesign/generic_fns/grace.py (original)
+++ branches/uf_redesign/generic_fns/grace.py Tue May 29 16:17:32 2012
@@ -232,11 +232,12 @@
                 point = data[0][index][-1]
 
                 # Conversion factors.
-                x_val[j] = x_val[j] / x_return_conversion_factor(x_data_type)
-                if x_err[j]:
+                if x_data_type != 'spin':
+                    x_val[j] = x_val[j] / 
x_return_conversion_factor(x_data_type)
+                if x_err[j] and x_data_type != 'spin':
                     x_err[j] = x_err[j] / 
x_return_conversion_factor(x_data_type)
                 y_val[j] = y_val[j] / y_return_conversion_factor(y_data_type)
-                if y_err[j]:
+                if y_err[j] and y_data_type != 'spin':
                     y_err[j] = y_err[j] / 
y_return_conversion_factor(y_data_type)
 
                 # Append the data.