Author: bugman Date: Wed Feb 20 15:47:45 2013 New Revision: 18531 URL: http://svn.gna.org/viewcvs/relax?rev=18531&view=rev Log: Fix for bug #20531 (https://gna.org/bugs/?20531). This is the bug of the RelaxFault during the final stages of the auto_analysis.dauvergne_protocol model-free analysis when the Molmol and PyMOL macros are being created. The problem was caused by model m9 (just the Rex parameter) when trying to determine what the order parameter for fast (< 200 ps) motions is. The code was assuming that the model-free model would always contain an order parameter. It is very strange that this has only been rarely encountered! Modified: trunk/specific_fns/model_free/macro_base.py Modified: trunk/specific_fns/model_free/macro_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_fns/model_free/macro_base.py?rev=18531&r1=18530&r2=18531&view=diff ============================================================================== --- trunk/specific_fns/model_free/macro_base.py (original) +++ trunk/specific_fns/model_free/macro_base.py Wed Feb 20 15:47:45 2013 @@ -29,7 +29,7 @@ # relax module imports. from colour import linear_gradient from generic_fns.mol_res_spin import spin_loop -from relax_errors import RelaxError, RelaxFault, RelaxStyleError, RelaxUnknownDataTypeError +from relax_errors import RelaxError, RelaxStyleError, RelaxUnknownDataTypeError from user_functions.data import Uf_tables; uf_tables = Uf_tables() from user_functions.objects import Desc_container @@ -174,10 +174,6 @@ elif (model == 'm2' or model == 'm4') and spin.te > 200e-12: self.classic_colour(res_num=res_num, width=0.3, rgb_array=[1, 1, 1]) - # Catch errors. - else: - raise RelaxFault - # Amplitude of slow motions. ############################