r24583 - in /branches/zooming_grid_search/specific_analyses: model_free/uf.py relax_disp/uf.py relax_fit/uf.py -- July 21, 2014 - 09:50

Author: bugman
Date: Mon Jul 21 09:50:45 2014
New Revision: 24583

URL: http://svn.gna.org/viewcvs/relax?rev=24583&view=rev
Log:
Updated all of the data_init() specific API calls where the spin ID is 
expected.


Modified:
    branches/zooming_grid_search/specific_analyses/model_free/uf.py
    branches/zooming_grid_search/specific_analyses/relax_disp/uf.py
    branches/zooming_grid_search/specific_analyses/relax_fit/uf.py

Modified: branches/zooming_grid_search/specific_analyses/model_free/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/model_free/uf.py?rev=24583&r1=24582&r2=24583&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/model_free/uf.py     
(original)
+++ branches/zooming_grid_search/specific_analyses/model_free/uf.py     Mon 
Jul 21 09:50:45 2014
@@ -264,9 +264,9 @@
                 raise RelaxTensorError('diffusion')
 
     # Loop over the sequence.
-    for spin in spin_loop(spin_id):
+    for spin, spin_id in spin_loop(spin_id, return_id=True):
         # Initialise the data structures (if needed).
-        api_model_free.data_init(spin)
+        api_model_free.data_init(spin_id)
 
         # Model-free model, equation, and parameter types.
         spin.model = model

Modified: branches/zooming_grid_search/specific_analyses/relax_disp/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/relax_disp/uf.py?rev=24583&r1=24582&r2=24583&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/relax_disp/uf.py     
(original)
+++ branches/zooming_grid_search/specific_analyses/relax_disp/uf.py     Mon 
Jul 21 09:50:45 2014
@@ -118,13 +118,13 @@
         cdp.model_type = 'disp'
 
     # Loop over the sequence.
-    for spin in spin_loop(skip_desel=True):
+    for spin, spin_id in spin_loop(skip_desel=True, return_id=True):
         # The model and parameter names.
         spin.model = model
         spin.params = params
 
         # Initialise the data structures (if needed).
-        api_relax_disp.data_init(spin)
+        api_relax_disp.data_init(spin_id)
 
 
 def select_model(model=MODEL_R2EFF):

Modified: branches/zooming_grid_search/specific_analyses/relax_fit/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/relax_fit/uf.py?rev=24583&r1=24582&r2=24583&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/relax_fit/uf.py      
(original)
+++ branches/zooming_grid_search/specific_analyses/relax_fit/uf.py      Mon 
Jul 21 09:50:45 2014
@@ -45,13 +45,13 @@
     cdp.curve_type = model
 
     # Loop over the sequence.
-    for spin in spin_loop():
+    for spin, spin_id in spin_loop(return_id=True):
         # Skip deselected spins.
         if not spin.select:
             continue
 
         # Initialise the data structures (if needed).
-        api_relax_fit.data_init(spin)
+        api_relax_fit.data_init(spin_id)
 
         # The model and parameter names.
         spin.model = model