r7728 - /1.3/generic_fns/intensity.py -- October 15, 2008 - 23:18

Author: semor
Date: Wed Oct 15 23:18:55 2008
New Revision: 7728

URL: http://svn.gna.org/viewcvs/relax?rev=7728&view=rev
Log:
Passed the 'file_data' variable to the det_dimensions() function and removed 
some 'self.' instances.

The system test for XEasy peak list support now goes further... However, more 
work is still needed.


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=7728&r1=7727&r2=7728&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Wed Oct 15 23:18:55 2008
@@ -38,16 +38,16 @@
 from relax_warnings import RelaxWarning, RelaxNoSpinWarning
 
 
-def det_dimensions():
+def det_dimensions(file_data):
     """Determine which are the proton and heteronuclei dimensions of the 
XEasy text file.
 
     @return:    None
     """
 
     # Loop over the lines of the file until the proton and heteronucleus is 
reached.
-    for i in xrange(len(self.file_data)):
+    for i in xrange(len(file_data)):
         # Extract the data.
-        res_num, w1_name, w2_name, intensity = 
self.intensity(self.file_data[i])
+        res_num, w1_name, w2_name, intensity = intensity(file_data[i])
 
         # Proton in w1, heteronucleus in w2.
         if w1_name == self.proton and w2_name == self.heteronuc:
@@ -354,7 +354,7 @@
 
     # Determine the proton and heteronucleus dimensions in the XEasy text 
file.
     if format == 'xeasy':
-        det_dimensions()
+        det_dimensions(file_data)
 
     # Loop over the peak intensity data.
     for i in xrange(len(file_data)):