r13112 - /branches/inversion-recovery/specific_fns/relax_fit.py -- June 17, 2011 - 17:16

Author: semor
Date: Fri Jun 17 17:16:09 2011
New Revision: 13112

URL: http://svn.gna.org/viewcvs/relax?rev=13112&view=rev
Log:

Placed the different options for function relax_fit.selec_model() into a list.

This is instead of the 'or' statement used before which was introducing a 
bug...

This was discussed in a thread at:
https://mail.gna.org/public/relax-devel/2011-06/msg00197.html
Message-id: <4DFB66B2.1090805@xxxxxxxxx>


Modified:
    branches/inversion-recovery/specific_fns/relax_fit.py

Modified: branches/inversion-recovery/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/relax_fit.py?rev=13112&r1=13111&r2=13112&view=diff
==============================================================================
--- branches/inversion-recovery/specific_fns/relax_fit.py (original)
+++ branches/inversion-recovery/specific_fns/relax_fit.py Fri Jun 17 17:16:09 
2011
@@ -484,12 +484,12 @@
             raise RelaxNoSequenceError
 
         # Two parameter fit.
-        if model == 'exp_2param' or 'exp_2param_neg' or 'exp_2param_inv' or 
'exp_2param_inv_neg':
+        if model in ['exp_2param', 'exp_2param_neg', 'exp_2param_inv', 
'exp_2param_inv_neg']:
             print("Two parameter exponential decay fit.")
             params = ['Rx', 'I0']
 
         # Three parameter fit.
-        elif model == 'exp_3param' or 'exp_3param_neg' or 'exp_3param_inv' 
or 'exp_3param_inv_neg':
+        elif model in ['exp_3param', 'exp_3param_neg', 'exp_3param_inv', 
'exp_3param_inv_neg']:
             print("Three parameter inversion recovery fit.")
             params = ['Rx', 'I0', 'Iinf']