r9048 - /1.3/prompt/pipe.py -- May 12, 2009 - 10:47

Author: bugman
Date: Tue May 12 10:47:02 2009
New Revision: 9048

URL: http://svn.gna.org/viewcvs/relax?rev=9048&view=rev
Log:
Updated the pipes.hybridise() user function interface to the 1.3 line design.


Modified:
    1.3/prompt/pipe.py

Modified: 1.3/prompt/pipe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/pipe.py?rev=9048&r1=9047&r2=9048&view=diff
==============================================================================
--- 1.3/prompt/pipe.py (original)
+++ 1.3/prompt/pipe.py Tue May 12 10:47:02 2009
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2004-2008 Edward d'Auvergne                                  
 #
+# Copyright (C) 2004-2009 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -31,6 +31,7 @@
 import help
 from generic_fns import pipes
 from relax_errors import RelaxListStrError, RelaxNoneListError, 
RelaxNoneStrError, RelaxStrError
+from specific_fns.setup import hybrid_obj
 
 
 class Pipe:
@@ -251,7 +252,7 @@
                     raise RelaxListStrError, ('data pipes', pipes)
 
         # Execute the functional code.
-        self.__relax__.specific.hybrid.hybridise(hybrid=hybrid, pipes=pipes)
+        hybrid_obj.hybridise(hybrid=hybrid, pipes=pipes)
 
 
     def list(self):