r16978 - /branches/interatomic/generic_fns/monte_carlo.py -- June 19, 2012 - 20:49

Author: bugman
Date: Tue Jun 19 20:49:26 2012
New Revision: 16978

URL: http://svn.gna.org/viewcvs/relax?rev=16978&view=rev
Log:
The Monte Carlo select_all_sims() function is now using the specific 
skip_function().

This is needed for recreating model-free simulations as deselected proton 
spin containers now exist.


Modified:
    branches/interatomic/generic_fns/monte_carlo.py

Modified: branches/interatomic/generic_fns/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/monte_carlo.py?rev=16978&r1=16977&r2=16978&view=diff
==============================================================================
--- branches/interatomic/generic_fns/monte_carlo.py (original)
+++ branches/interatomic/generic_fns/monte_carlo.py Tue Jun 19 20:49:26 2012
@@ -319,6 +319,7 @@
     # Model loop and set the selected simulation array functions.
     model_loop = get_specific_fn('model_loop', cdp.pipe_type)
     set_selected_sim = get_specific_fn('set_selected_sim', cdp.pipe_type)
+    skip_function = get_specific_fn('skip_function', cdp.pipe_type)
 
     # Create the selected simulation array with all simulations selected.
     if all_select_sim == None:
@@ -327,6 +328,10 @@
     # Loop over the models.
     i = 0
     for model_info in model_loop():
+        # Skip function.
+        if skip_function(model_info):
+            continue
+
         # Set up the selected simulation array.
         if all_select_sim != None:
             select_sim = all_select_sim[i]
@@ -335,7 +340,7 @@
         set_selected_sim(model_info, select_sim)
 
         # Model index.
-        i = i + 1
+        i += 1
 
 
 def setup(number=None, all_select_sim=None):