r7386 - /1.3/specific_fns/model_free/main.py -- September 26, 2008 - 23:44

Author: bugman
Date: Fri Sep 26 23:44:40 2008
New Revision: 7386

URL: http://svn.gna.org/viewcvs/relax?rev=7386&view=rev
Log:
Fix for the sim_return_selected() method.  The wrong argument was assumed.


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=7386&r1=7385&r2=7386&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Fri Sep 26 23:44:40 2008
@@ -2997,18 +2997,16 @@
                 inc = inc + 1
 
 
-    def sim_return_selected(self, spin_id):
+    def sim_return_selected(self, model_index):
         """Return the array of selected simulation flags for the spin.
 
-        @param spin_id:     The spin identification string, as yielded by 
the base_data_loop()
-                            generator method.
-        @type spin_id:      str
+        @param model_index: The model index.  This is zero for the global 
models or equal to the
+                            global spin index (which covers the molecule, 
residue, and spin
+                            indices).
+        @type model_index:  int
         @return:            The array of selected simulation flags.
         @rtype:             list of int
         """
-
-        # Get the spin container.
-        spin = return_spin(spin_id)
 
         # Determine the model type.
         model_type = self.determine_model_type()
@@ -3019,6 +3017,10 @@
 
         # Multiple instances.
         else:
+            # Get the spin container.
+            spin = return_spin_from_index(model_index)
+
+            # Return the list.
             return spin.select_sim