r14797 - /1.3/generic_fns/grace.py -- October 05, 2011 - 19:21

Author: bugman
Date: Wed Oct  5 19:21:23 2011
New Revision: 14797

URL: http://svn.gna.org/viewcvs/relax?rev=14797&view=rev
Log:
Fix for bug #18789 - the zero errors in Grace files.

This was submitted by Elio Cino <ecino att uwo dott ca> at 
https://gna.org/bugs/?18789.

The problem was that the errors were being taken as the X-axis error values, 
which in the case of
spin specific data is zero.  Now the Y-axis errors are taken rather than the 
unused X-axis errors.
This appears to have triggered a bug in the test suite relating to Grace 
files with both X and Y-
axis errors.


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=14797&r1=14796&r2=14797&view=diff
==============================================================================
--- 1.3/generic_fns/grace.py (original)
+++ 1.3/generic_fns/grace.py Wed Oct  5 19:21:23 2011
@@ -271,11 +271,11 @@
                 new_data[i][j][k].append(data[i][j][k][1])
 
                 # First error set.
-                if graph_type in ['xydx', 'xydy', 'xydxdy']:
+                if graph_type in ['xydx', 'xydxdy']:
                     new_data[i][j][k].append(data[i][j][k][2])
 
                 # Second error set.
-                if graph_type == 'xydxdy':
+                elif graph_type in ['xydy', 'xydxdy']:
                     new_data[i][j][k].append(data[i][j][k][3])
 
     # Return the data.