r9055 - /1.3/specific_fns/hybrid.py -- May 12, 2009 - 11:34

Author: bugman
Date: Tue May 12 11:34:40 2009
New Revision: 9055

URL: http://svn.gna.org/viewcvs/relax?rev=9055&view=rev
Log:
Added a check for the pipe type to hybridise().


Modified:
    1.3/specific_fns/hybrid.py

Modified: 1.3/specific_fns/hybrid.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=9055&r1=9054&r2=9055&view=diff
==============================================================================
--- 1.3/specific_fns/hybrid.py (original)
+++ 1.3/specific_fns/hybrid.py Tue May 12 11:34:40 2009
@@ -64,13 +64,18 @@
         if hybrid in pipes.pipe_names():
             raise RelaxPipeError, hybrid
 
-        # Loop over the pipes to be hybridised.
+        # Loop over the pipes to be hybridised and check them.
+        pipe_type = pipes.get_type(pipe_list[0])
         for pipe in pipe_list:
             # Switch to the data pipe.
             pipes.switch(pipe)
 
             # Test if the pipe exists.
             pipes.test()
+
+            # Check that the pipe types match.
+            if pipes.get_type() != pipe_type:
+                raise RelaxError, "The data pipe types do not match."
 
             # Test if sequence data is loaded.
             if not exists_mol_res_spin_data():