r18532 - in /branches/frame_order_testing: ./ specific_fns/model_free/macro_base.py -- February 20, 2013 - 15:48

Author: bugman
Date: Wed Feb 20 15:48:17 2013
New Revision: 18532

URL: http://svn.gna.org/viewcvs/relax?rev=18532&view=rev
Log:
Merged revisions 18531 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18531 | bugman | 2013-02-20 15:47:45 +0100 (Wed, 20 Feb 2013) | 9 lines
  
  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:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/model_free/macro_base.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 20 15:48:17 2013
@@ -1,1 +1,1 @@
-/trunk:1-18529
+/trunk:1-18531

Modified: branches/frame_order_testing/specific_fns/model_free/macro_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/macro_base.py?rev=18532&r1=18531&r2=18532&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/model_free/macro_base.py 
(original)
+++ branches/frame_order_testing/specific_fns/model_free/macro_base.py Wed 
Feb 20 15:48:17 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.
         ############################