r7274 - /1.3/specific_fns/model_free/main.py -- September 24, 2008 - 19:55

Author: bugman
Date: Wed Sep 24 19:55:23 2008
New Revision: 7274

URL: http://svn.gna.org/viewcvs/relax?rev=7274&view=rev
Log:
Fix for the model-free model_loop() generator function.


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Wed Sep 24 19:55:23 2008
@@ -1593,16 +1593,18 @@
         # Spin specific models.
         else:
             # Loop over the spins.
-            for index in spin_index_loop():
-                # Get the spin container.
-                spin = return_spin_from_index(index)
-
+            global_index = -1
+            for spin in spin_loop():
                 # Skip deselected spins.
                 if not spin.select:
                     continue
 
+                # Increment the global spin index.
+                global_index = global_index + 1
+
                 # Yield the spin index.
                 yield index
+
 
     def model_setup(self, model=None, equation=None, params=None, 
spin_id=None):
         """Function for updating various data structures depending on the 
model selected.