r5996 - /1.3/generic_fns/intensity.py -- April 24, 2008 - 18:39

Author: bugman
Date: Thu Apr 24 18:39:33 2008
New Revision: 5996

URL: http://svn.gna.org/viewcvs/relax?rev=5996&view=rev
Log:
Fixed a name clash between the intensity arg and intensity fn.


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=5996&r1=5995&r2=5996&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Thu Apr 24 18:39:33 2008
@@ -239,7 +239,7 @@
         print "Sparky formatted data file.\n"
 
         # Set the intensity reading function.
-        intensity = intensity_sparky
+        intensity_fn = intensity_sparky
 
     # XEasy.
     elif format == 'xeasy':
@@ -247,7 +247,7 @@
         print "XEasy formatted data file.\n"
 
         # Set the intensity reading function.
-        intensity = intensity_xeasy
+        intensity_fn = intensity_xeasy
 
         # Set the default proton dimension.
         H_dim = 'w1'
@@ -264,7 +264,7 @@
     file_data = extract_data(file, dir)
 
     # Determine the number of header lines.
-    num = number_of_header_lines(file_data, format, int_col, intensity)
+    num = number_of_header_lines(file_data, format, int_col, intensity_fn)
     print "Number of header lines found: " + `num`
 
     # Remove the header.
@@ -280,7 +280,7 @@
     # Loop over the peak intensity data.
     for i in xrange(len(file_data)):
         # Extract the data.
-        res_num, H_name, X_name, intensity = intensity(file_data[i])
+        res_num, H_name, X_name, intensity = intensity_fn(file_data[i])
 
         # Skip data.
         if X_name != heteronuc or H_name != proton: