r19945 - /branches/relax_disp/specific_analyses/relax_disp/sherekhan.py -- June 07, 2013 - 13:54

Author: bugman
Date: Fri Jun  7 13:54:29 2013
New Revision: 19945

URL: http://svn.gna.org/viewcvs/relax?rev=19945&view=rev
Log:
Fix for the relax_disp.sherekhan_input user function.

The loop_cluster() function no longer returns spin containers.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/sherekhan.py

Modified: branches/relax_disp/specific_analyses/relax_disp/sherekhan.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/sherekhan.py?rev=19945&r1=19944&r2=19945&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/sherekhan.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/sherekhan.py Fri Jun  7 
13:54:29 2013
@@ -40,7 +40,7 @@
 from pipe_control import pipes
 from pipe_control.spectrometer import get_frequencies
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, 
return_residue, spin_loop
-from specific_analyses.relax_disp.disp_data import loop_cluster, loop_frq, 
loop_point, return_param_key_from_data
+from specific_analyses.relax_disp.disp_data import loop_cluster, loop_frq, 
loop_point, return_param_key_from_data, spin_ids_to_containers
 
 
 def sherekhan_input(spin_id=None, force=False):
@@ -73,7 +73,10 @@
 
     # Loop over the spin blocks.
     cluster_index = 0
-    for spins, spin_ids in loop_cluster():
+    for spin_ids in loop_cluster():
+        # The spin containers.
+        spins = spin_ids_to_containers(spin_ids)
+
         # Loop over the magnetic fields.
         frq_index = 0
         for frq in loop_frq():