r7741 - /1.3/generic_fns/intensity.py -- October 16, 2008 - 04:28

Author: semor
Date: Thu Oct 16 04:28:28 2008
New Revision: 7741

URL: http://svn.gna.org/viewcvs/relax?rev=7741&view=rev
Log:
Corrected a name clash.

This originates from a post by Edward at:
https://mail.gna.org/public/relax-devel/2008-10/msg00060.html (message ID:
7f080ed10810151446p58ab78f1u93cb1bc4afbeb202@xxxxxxxxxxxxxx).

I hope this fixes the problem...


Modified:
    1.3/generic_fns/intensity.py

Modified: 1.3/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=7741&r1=7740&r2=7741&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Thu Oct 16 04:28:28 2008
@@ -47,7 +47,7 @@
     # Loop over the lines of the file until the proton and heteronucleus is 
reached.
     for i in xrange(len(file_data)):
         # Extract the data.
-        res_num, w1_name, w2_name, intensity = intensity(file_data[i])
+        res_num, w1_name, w2_name, intensity = intensity_xeasy(file_data[i])
 
         # Proton in w1, heteronucleus in w2.
         if w1_name == self.proton and w2_name == self.heteronuc: