Author: bugman Date: Thu Sep 1 13:25:54 2011 New Revision: 14567 URL: http://svn.gna.org/viewcvs/relax?rev=14567&view=rev Log: Bug fixes for all of the specific analyses for running Monte Carlo simulations multiple times. Many of the specific analyses were raising RelaxErrors if simulations had previously been run. Now this no longer occurs, so that the analysis can be re-run! Modified: 1.3/specific_fns/api_common.py 1.3/specific_fns/n_state_model.py 1.3/specific_fns/relax_fit.py Modified: 1.3/specific_fns/api_common.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/api_common.py?rev=14567&r1=14566&r2=14567&view=diff ============================================================================== --- 1.3/specific_fns/api_common.py (original) +++ 1.3/specific_fns/api_common.py Thu Sep 1 13:25:54 2011 @@ -595,10 +595,6 @@ # Get the spin container. spin = return_spin(data_id) - # Test if the simulation data already exists. - if hasattr(spin, 'ri_data_sim'): - raise RelaxError("Monte Carlo simulation data already exists.") - # Initialise the data structure. spin.ri_data_sim = {} Modified: 1.3/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=14567&r1=14566&r2=14567&view=diff ============================================================================== --- 1.3/specific_fns/n_state_model.py (original) +++ 1.3/specific_fns/n_state_model.py Thu Sep 1 13:25:54 2011 @@ -2441,10 +2441,6 @@ # Get the spin container. spin = return_spin(data_id[0]) - # Test if the simulation data already exists. - if hasattr(spin, 'sim_intensities'): - raise RelaxError("Monte Carlo simulation data already exists.") - # RDC data. if data_id[1] == 'rdc' and hasattr(spin, 'rdc'): # Initialise. Modified: 1.3/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=14567&r1=14566&r2=14567&view=diff ============================================================================== --- 1.3/specific_fns/relax_fit.py (original) +++ 1.3/specific_fns/relax_fit.py Thu Sep 1 13:25:54 2011 @@ -1062,9 +1062,5 @@ # Get the spin container. spin = return_spin(data_id) - # Test if the simulation data already exists. - if hasattr(spin, 'sim_intensities'): - raise RelaxError("Monte Carlo simulation data already exists.") - # Create the data structure. spin.sim_intensities = sim_data