r21539 - /branches/relax_disp/specific_analyses/relax_disp/sherekhan.py -- November 20, 2013 - 11:29

Author: bugman
Date: Wed Nov 20 11:29:25 2013
New Revision: 21539

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


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=21539&r1=21538&r2=21539&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/sherekhan.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/sherekhan.py Wed Nov 20 
11:29:25 2013
@@ -74,8 +74,7 @@
         spins = spin_ids_to_containers(spin_ids)
 
         # Loop over the magnetic fields.
-        frq_index = 0
-        for exp_type, frq in loop_exp_frq():
+        for exp_type, frq, exp_type_index, frq_index in 
loop_exp_frq(return_indices=True):
             # The ShereKhan input file for the spin cluster.
             file_name = 'sherekhan_frq%s.in' % (frq_index+1)
             dir_name = 'cluster%s' % (cluster_index+1)
@@ -107,7 +106,7 @@
                 lines.append("# %s%s\n" % (res_name, res.num))
 
                 # Loop over the dispersion points.
-                for point in loop_point(exp_type=exp_type, skip_ref=True):
+                for point in loop_point(exp_type_index=exp_type_index, 
frq_index=frq_index, skip_ref=True):
                     # The parameter key.
                     param_key = 
return_param_key_from_data(exp_type=exp_type, frq=frq, point=point)
 
@@ -129,8 +128,5 @@
             # Close the file.
             file.close()
 
-            # Increment the field index.
-            frq_index += 1
-
         # Increment the cluster index.
         cluster_index += 1