r13577 - /1.3/generic_fns/mol_res_spin.py -- July 13, 2011 - 11:44

Author: bugman
Date: Wed Jul 13 11:44:38 2011
New Revision: 13577

URL: http://svn.gna.org/viewcvs/relax?rev=13577&view=rev
Log:
Many bug fixes for the functions of the generic_fns.mol_res_spin module.

These fixes are for when a data pipe other than the current data pipe is used.


Modified:
    1.3/generic_fns/mol_res_spin.py

Modified: 1.3/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=13577&r1=13576&r2=13577&view=diff
==============================================================================
--- 1.3/generic_fns/mol_res_spin.py (original)
+++ 1.3/generic_fns/mol_res_spin.py Wed Jul 13 11:44:38 2011
@@ -803,14 +803,14 @@
     pipes.test(pipe)
 
     # No data, hence no molecules.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return 0
 
     # Init.
     mol_num = 0
 
     # Spin loop.
-    for mol in molecule_loop(selection):
+    for mol in molecule_loop(selection, pipe=pipe):
         mol_num = mol_num + 1
 
     # Return the number of molecules.
@@ -836,14 +836,14 @@
     pipes.test(pipe)
 
     # No data, hence no residues.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return 0
 
     # Init.
     res_num = 0
 
     # Spin loop.
-    for res in residue_loop(selection):
+    for res in residue_loop(selection, pipe=pipe):
         res_num = res_num + 1
 
     # Return the number of residues.
@@ -872,14 +872,14 @@
     pipes.test(pipe)
 
     # No data, hence no spins.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return 0
 
     # Init.
     spin_num = 0
 
     # Spin loop.
-    for spin in spin_loop(selection):
+    for spin in spin_loop(selection, pipe=pipe):
         # Skip deselected spins.
         if skip_desel and not spin.select:
             continue
@@ -1554,7 +1554,7 @@
     dp = pipes.get_pipe(pipe)
 
     # Test for the presence of data, and end the execution of this function 
if there is none.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return
 
     # Parse the selection string.
@@ -1916,7 +1916,7 @@
     dp = pipes.get_pipe(pipe)
 
     # Test for the presence of data, and end the execution of this function 
if there is none.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return
 
     # Parse the selection string.
@@ -2147,7 +2147,7 @@
 
     # Loop over the spins.
     spin_num = 0
-    for spin, mol_name, res_num, res_name in spin_loop(full_info=True):
+    for spin, mol_name, res_num, res_name in spin_loop(full_info=True, 
pipe=pipe):
         # Match to the global index.
         if spin_num == global_index:
             # Return the spin and the spin_id string.
@@ -2483,7 +2483,7 @@
     dp = pipes.get_pipe(pipe)
 
     # Test for the presence of data, and end the execution of this function 
if there is none.
-    if not exists_mol_res_spin_data():
+    if not exists_mol_res_spin_data(pipe=pipe):
         return
 
     # Parse the selection string.
@@ -2538,7 +2538,7 @@
     dp = pipes.get_pipe(pipe)
 
     # Test for the presence of data, and end the execution of this function 
if there is none.
-    if not exists_mol_res_spin_data(pipe):
+    if not exists_mol_res_spin_data(pipe=pipe):
         return
 
     # Parse the selection string.