r10687 - in /branches/bieri_gui: ./ auto_analyses/relax_fit.py -- February 06, 2010 - 03:05

Author: bugman
Date: Sat Feb  6 03:05:12 2010
New Revision: 10687

URL: http://svn.gna.org/viewcvs/relax?rev=10687&view=rev
Log:
Merged revisions 10684 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r10684 | bugman | 2010-02-06 02:52:44 +0100 (Sat, 06 Feb 2010) | 5 lines
  
  A couple of fixes for the Relax_fit auto analysis class.
  
  The interpreter was not being imported and a class variable was missing the 
'self.' part!
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/auto_analyses/relax_fit.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb  6 03:05:12 2010
@@ -1,1 +1,1 @@
-/1.3:1-10680
+/1.3:1-10686

Modified: branches/bieri_gui/auto_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/relax_fit.py?rev=10687&r1=10686&r2=10687&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/relax_fit.py (original)
+++ branches/bieri_gui/auto_analyses/relax_fit.py Sat Feb  6 03:05:12 2010
@@ -22,6 +22,9 @@
 
 # Module docstring.
 """The automatic relaxation curve fitting protocol."""
+
+# relax module imports.
+from prompt.interpreter import Interpreter
 
 
 
@@ -67,7 +70,7 @@
         """Set up and run the curve-fitting."""
 
         # Create the data pipe.
-        self.interpreter.pipe.create(pipe_name, 'relax_fit')
+        self.interpreter.pipe.create(self.pipe_name, 'relax_fit')
 
         # Load the sequence.
         self.interpreter.sequence.read(file=self.seq_args[0], 
dir=self.seq_args[1], mol_name_col=self.seq_args[2], 
res_num_col=self.seq_args[3], res_name_col=self.seq_args[4], 
spin_num_col=self.seq_args[5], spin_name_col=self.seq_args[6], 
sep=self.seq_args[7])