r13578 - in /branches/gui_testing: ./ generic_fns/mol_res_spin.py -- July 13, 2011 - 11:46

Author: bugman
Date: Wed Jul 13 11:46:50 2011
New Revision: 13578

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

........
  r13577 | bugman | 2011-07-13 11:44:38 +0200 (Wed, 13 Jul 2011) | 5 lines
  
  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:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/mol_res_spin.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 13 11:46:50 2011
@@ -1,1 +1,1 @@
-/1.3:1-13512
+/1.3:1-13577

Modified: branches/gui_testing/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/mol_res_spin.py?rev=13578&r1=13577&r2=13578&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/mol_res_spin.py (original)
+++ branches/gui_testing/generic_fns/mol_res_spin.py Wed Jul 13 11:46:50 2011
@@ -794,14 +794,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.
@@ -827,14 +827,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.
@@ -863,14 +863,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
@@ -1599,7 +1599,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.
@@ -1961,7 +1961,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.
@@ -2192,7 +2192,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.
@@ -2528,7 +2528,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.
@@ -2583,7 +2583,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.