r7379 - /1.3/specific_fns/model_free/main.py -- September 26, 2008 - 22:43

Author: bugman
Date: Fri Sep 26 22:43:10 2008
New Revision: 7379

URL: http://svn.gna.org/viewcvs/relax?rev=7379&view=rev
Log:
Converted the sim_return_selected() method to the new design.


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=7379&r1=7378&r2=7379&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Fri Sep 26 22:43:10 2008
@@ -2997,22 +2997,25 @@
                 inc = inc + 1
 
 
-    def sim_return_selected(self, run, instance):
-        """Function for returning the array of selected simulation flags."""
-
-        # Arguments.
-        self.run = run
+    def sim_return_selected(self, spin):
+        """Return the array of selected simulation flags for the spin.
+
+        @param spin:        The spin container.
+        @type spin:         SpinContainer instance
+        @return:            The array of selected simulation flags.
+        @rtype:             list of int
+        """
 
         # Determine the model type.
         model_type = self.determine_model_type()
 
         # Single instance.
         if model_type == 'all' or model_type == 'diff':
-            return ds.select_sim[self.run]
+            return ds[ds.current_pipe].select_sim
 
         # Multiple instances.
         else:
-            return ds.res[self.run][instance].select_sim
+            return spin.select_sim
 
 
     def skip_function(self, instance=None, min_instances=None, 
num_instances=None):