r5993 - /1.3/generic_fns/intensity.py -- April 24, 2008 - 18:05

Author: bugman
Date: Thu Apr 24 18:05:24 2008
New Revision: 5993

URL: http://svn.gna.org/viewcvs/relax?rev=5993&view=rev
Log:
Converted the number_of_header_lines() function to the new design.


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=5993&r1=5992&r2=5993&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Thu Apr 24 18:05:24 2008
@@ -138,18 +138,25 @@
     return res_num, h_name, x_name, intensity
 
 
-def number_of_header_lines():
+def number_of_header_lines(file_data, format, intensity):
     """Function for determining how many header lines are in the intensity 
file.
 
-    @return:    The number of header lines.
-    @rtype:     int
+    @param file_data:   The processed results file data.
+    @type file_data:    list of lists of str
+    @param format:      The type of file containing peak intensities.  This 
can currently be one of
+                        'sparky' or 'xeasy'.
+    @type format:       str
+    @param intensity:   The intensity extraction function.
+    @type intensity:    func
+    @return:            The number of header lines.
+    @rtype:             int
     """
 
     # Sparky.
     #########
 
     # Assume the Sparky file has two header lines!
-    if self.format == 'sparky':
+    if format == 'sparky':
         return 2
 
 
@@ -158,10 +165,10 @@
 
     # Loop over the lines of the file until a peak intensity value is 
reached.
     header_lines = 0
-    for i in xrange(len(self.file_data)):
+    for i in xrange(len(file_data)):
         # Try to see if the intensity can be extracted.
         try:
-            self.intensity(self.file_data[i])
+            intensity(file_data[i])
         except RelaxError:
             header_lines = header_lines + 1
         except IndexError:
@@ -231,7 +238,7 @@
     file_data = extract_data(file, dir)
 
     # Determine the number of header lines.
-    num = number_of_header_lines()
+    num = number_of_header_lines(file_data, format, intensity)
     print "Number of header lines found: " + `num`
 
     # Remove the header.