r5806 - /1.3/generic_fns/palmer.py -- April 16, 2008 - 22:11

Author: bugman
Date: Wed Apr 16 22:11:44 2008
New Revision: 5806

URL: http://svn.gna.org/viewcvs/relax?rev=5806&view=rev
Log:
Fix for the get_mf_data() function.


Modified:
    1.3/generic_fns/palmer.py

Modified: 1.3/generic_fns/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=5806&r1=5805&r2=5806&view=diff
==============================================================================
--- 1.3/generic_fns/palmer.py (original)
+++ 1.3/generic_fns/palmer.py Wed Apr 16 22:11:44 2008
@@ -579,7 +579,7 @@
         pos = pos + 1
 
 
-def get_mf_data(pos):
+def get_mf_data(mfout_lines, pos):
     """Extract the model-free data from the given position of the mfout file.
 
     This method is designed to catch a number of bugs in Modelfree4's mfout 
file.
@@ -595,14 +595,16 @@
     This is caught by scanning for two '.' characters in the column, and 
handled by assuming
     that every floating point number will have three decimal characters.
 
-    @param pos:     The mfout line position.
-    @type pos:      int
-    @return:        The value and error.
-    @rtype:         tuple of 2 floats
+    @param mfout_lines: A list of all the lines of the mfout file.
+    @type mfout_lines:  list of str
+    @param pos:         The mfout line position.
+    @type pos:          int
+    @return:            The value and error.
+    @rtype:             tuple of 2 floats
     """
 
     # Split the line up.
-    row = split(self.mfout_lines[pos])
+    row = split(mfout_lines[pos])
 
     # The value and error, assuming a bug free mfout file.
     val = row[1]