r2837 - /1.2/generic_fns/intensity.py -- November 13, 2006 - 07:22

Author: bugman
Date: Mon Nov 13 07:21:36 2006
New Revision: 2837

URL: http://svn.gna.org/viewcvs/relax?rev=2837&view=rev
Log:
Fixed a newly introduced bug in the reading of Sparky peak intensities.

The bug was caused by r2798 
(https://mail.gna.org/public/relax-commits/2006-11/msg00096.html).  The
expected proton and heteronucleus names returned by the 
'self.intensit_xxxxx()' functions had been
swapped but the Sparky intensity function had not been updated.


Modified:
    1.2/generic_fns/intensity.py

Modified: 1.2/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/generic_fns/intensity.py?rev=2837&r1=2836&r2=2837&view=diff
==============================================================================
--- 1.2/generic_fns/intensity.py (original)
+++ 1.2/generic_fns/intensity.py Mon Nov 13 07:21:36 2006
@@ -94,7 +94,7 @@
             raise RelaxError, "The peak intensity value " + `intensity` + " 
from the line " + `line` + " is invalid."
 
         # Return the data.
-        return res_num, x_name, h_name, intensity
+        return res_num, h_name, x_name, intensity
 
 
     def intensity_xeasy(self, line):