r2839 - /branches/tensor_pdb/generic_fns/intensity.py -- November 13, 2006 - 07:25

Author: bugman
Date: Mon Nov 13 07:24:59 2006
New Revision: 2839

URL: http://svn.gna.org/viewcvs/relax?rev=2839&view=rev
Log:
Ported r2837 from the 1.2 line.

The command used was:
svn merge -r2836:2837 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2

This fixes a bug in the Sparky peak intensity code.


Modified:
    branches/tensor_pdb/generic_fns/intensity.py

Modified: branches/tensor_pdb/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/generic_fns/intensity.py?rev=2839&r1=2838&r2=2839&view=diff
==============================================================================
--- branches/tensor_pdb/generic_fns/intensity.py (original)
+++ branches/tensor_pdb/generic_fns/intensity.py Mon Nov 13 07:24:59 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):