Author: bugman Date: Tue Feb 17 17:02:40 2015 New Revision: 27663 URL: http://svn.gna.org/viewcvs/relax?rev=27663&view=rev Log: Fix to allow Monte Carlo simulations to be repeated in the frame order analysis. The code for checking for pre-existing Monte Carlo simulation data structures and raising a RelaxError if anything is found has been deleted. Modified: branches/frame_order_cleanup/specific_analyses/frame_order/api.py Modified: branches/frame_order_cleanup/specific_analyses/frame_order/api.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/api.py?rev=27663&r1=27662&r2=27663&view=diff ============================================================================== --- branches/frame_order_cleanup/specific_analyses/frame_order/api.py (original) +++ branches/frame_order_cleanup/specific_analyses/frame_order/api.py Tue Feb 17 17:02:40 2015 @@ -794,27 +794,6 @@ # Get the minimisation statistic object names. min_names = self.data_names(set='min') - - # Test if Monte Carlo parameter values have already been set. - ############################################################# - - # Loop over all the parameter names. - for object_name in param_names: - # Not a parameter of the model. - if object_name not in model_params: - continue - - # Name for the simulation object. - sim_object_name = object_name + '_sim' - - # Test if the simulation object already exists. - if hasattr(cdp, sim_object_name): - raise RelaxError("Monte Carlo parameter values have already been set.") - - - # Set the Monte Carlo parameter values. - ####################################### - # Loop over all the data names. for object_name in param_names: # Not a parameter of the model.