r6214 - /1.3/generic_fns/monte_carlo.py -- May 21, 2008 - 23:18

Author: bugman
Date: Wed May 21 23:15:34 2008
New Revision: 6214

URL: http://svn.gna.org/viewcvs/relax?rev=6214&view=rev
Log:
Fixed all specific function setups in the Monte Carlo sim module.


Modified:
    1.3/generic_fns/monte_carlo.py

Modified: 1.3/generic_fns/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/monte_carlo.py?rev=6214&r1=6213&r2=6214&view=diff
==============================================================================
--- 1.3/generic_fns/monte_carlo.py (original)
+++ 1.3/generic_fns/monte_carlo.py Wed May 21 23:15:34 2008
@@ -132,16 +132,13 @@
     if not hasattr(relax_data_store, 'sim_state'):
         raise RelaxError, "Monte Carlo simulations for the run " + 
`self.run` + " have not been set up."
 
-    # Function type.
-    function_type = 
relax_data_store.run_types[relax_data_store.run_names.index(self.run)]
-
     # Specific number of instances, return simulation chi2 array, return 
selected simulation array, return simulation parameter array, and set error 
functions.
-    count_num_instances = self.relax.specific_setup.setup('num_instances', 
function_type)
+    count_num_instances = get_specific_fn('num_instances', cdp.pipe_type)
     if prune > 0.0:
-        return_sim_chi2 = self.relax.specific_setup.setup('return_sim_chi2', 
function_type)
-    return_selected_sim = 
self.relax.specific_setup.setup('return_selected_sim', function_type)
-    return_sim_param = self.relax.specific_setup.setup('return_sim_param', 
function_type)
-    set_error = self.relax.specific_setup.setup('set_error', function_type)
+        return_sim_chi2 = get_specific_fn('return_sim_chi2', cdp.pipe_type)
+    return_selected_sim = get_specific_fn('return_selected_sim', 
cdp.pipe_type)
+    return_sim_param = get_specific_fn('return_sim_param', cdp.pipe_type)
+    set_error = get_specific_fn('set_error', cdp.pipe_type)
 
     # Count the number of instances.
     num_instances = count_num_instances(self.run)
@@ -268,11 +265,8 @@
     if not hasattr(relax_data_store, 'sim_state'):
         raise RelaxError, "Monte Carlo simulations for the run " + 
`self.run` + " have not been set up."
 
-    # Function type.
-    function_type = 
relax_data_store.run_types[relax_data_store.run_names.index(self.run)]
-
     # Specific initial Monte Carlo parameter value function setup.
-    init_sim_values = self.relax.specific_setup.setup('init_sim_values', 
function_type)
+    init_sim_values = get_specific_fn('init_sim_values', cdp.pipe_type)
 
     # Set the initial parameter values.
     init_sim_values(self.run)
@@ -315,14 +309,11 @@
 
 
 def select_all_sims(number=None, all_select_sim=None):
-    """Function for setting the select flag of all simulations of all 
instances to one."""
-
-    # Function type.
-    function_type = 
relax_data_store.run_types[relax_data_store.run_names.index(self.run)]
+    """Set the select flag of all simulations of all instances to one."""
 
     # Specific number of instances and set the selected simulation array 
functions.
-    count_num_instances = self.relax.specific_setup.setup('num_instances', 
function_type)
-    set_selected_sim = self.relax.specific_setup.setup('set_selected_sim', 
function_type)
+    count_num_instances = get_specific_fn('num_instances', cdp.pipe_type)
+    set_selected_sim = get_specific_fn('set_selected_sim', cdp.pipe_type)
 
     # Count the number of instances.
     num_instances = count_num_instances(self.run)