r6562 - /1.3/specific_fns/model_free/main.py -- June 29, 2008 - 02:17

Author: bugman
Date: Sun Jun 29 02:17:56 2008
New Revision: 6562

URL: http://svn.gna.org/viewcvs/relax?rev=6562&view=rev
Log:
Converted the skip_function() method to the new relax 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=6562&r1=6561&r2=6562&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sun Jun 29 02:17:56 2008
@@ -2906,26 +2906,31 @@
             return ds.res[self.run][instance].select_sim
 
 
-    def skip_function(self, run=None, instance=None, min_instances=None, 
num_instances=None):
-        """Function for skiping certain data."""
-
-        # Arguments.
-        self.run = run
+    def skip_function(self, instance=None, min_instances=None, 
num_instances=None):
+        """Skip certain data.
+
+        @keyword instance:      The index of the minimisation instance.
+        @type instance:         int
+        @keyword min_instances: The total number of minimisation instances.
+        @type min_instances:    int
+        @keyword num_instances: The total number of instances.
+        @type num_instances:    int
+        """
 
         # Determine the parameter set type.
-        self.param_set = self.determine_param_set_type()
-
-        # All residues.
-        combine = 0
+        param_set = self.determine_param_set_type()
+
+        # All spins.
+        combine = False
         if min_instances == 1 and min_instances != num_instances:
-            combine = 1
+            combine = True
 
         # Sequence specific data.
-        if (self.param_set == 'mf' or self.param_set == 'local_tm') and not 
combine and not ds.res[self.run][instance].select:
-            return 1
+        if (param_set == 'mf' or param_set == 'local_tm') and not combine 
and not return_spin_from_index(instance).select:
+            return True
 
         # Don't skip.
-        return 0
+        return False
 
 
     def deselect(self, run, i, sim_index=None):