r24584 - /branches/zooming_grid_search/specific_analyses/api_common.py -- July 21, 2014 - 09:59

Author: bugman
Date: Mon Jul 21 09:59:34 2014
New Revision: 24584

URL: http://svn.gna.org/viewcvs/relax?rev=24584&view=rev
Log:
Fixes for the _data_init_spin() specific API common method.

The data returned from _base_data_loop_spin() is just the spin ID, the spin 
container is not
included.


Modified:
    branches/zooming_grid_search/specific_analyses/api_common.py

Modified: branches/zooming_grid_search/specific_analyses/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/api_common.py?rev=24584&r1=24583&r2=24584&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/api_common.py        
(original)
+++ branches/zooming_grid_search/specific_analyses/api_common.py        Mon 
Jul 21 09:59:34 2014
@@ -93,14 +93,15 @@
     def _data_init_spin(self, data, sim=False):
         """Initialise data structures (spin system specific).
 
-        @param data:    The spin container and the spin ID string from the 
_base_data_loop_spin() method.
-        @type data:     SpinContainer instance, str
+        @param data:    The spin ID string from the _base_data_loop_spin() 
method.
+        @type data:     str
         @keyword sim:   The Monte Carlo simulation flag, which if true will 
initialise the simulation data structure.
         @type sim:      bool
         """
 
-        # Unpack the data.
-        spin, spin_id = data
+        # Alias the data and get the spin container.
+        spin_id = data
+        spin = return_spin(spin_id)
 
         # Loop over the parameters.
         for name in self._PARAMS.loop(set='params', scope='spin', 
error_names=False, sim_names=sim):