r12534 - /branches/bmrb/specific_fns/model_free/bmrb.py -- February 17, 2011 - 10:41

Author: bugman
Date: Thu Feb 17 10:41:36 2011
New Revision: 12534

URL: http://svn.gna.org/viewcvs/relax?rev=12534&view=rev
Log:
The Modelfree software problem of calling ts te is now handled correctly.

The te parameter is now converted to ts, and the te parameter and error in 
relax are set to None.


Modified:
    branches/bmrb/specific_fns/model_free/bmrb.py

Modified: branches/bmrb/specific_fns/model_free/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/model_free/bmrb.py?rev=12534&r1=12533&r2=12534&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Thu Feb 17 10:41:36 2011
@@ -195,30 +195,41 @@
                 # Loop over and set the model-free parameters.
                 for j in range(len(mf_params)):
                     # No parameter.
-                    if not mf_bmrb_key[j] in keys or data[mf_bmrb_key[j]] == 
None:
+                    if not mf_bmrb_key[j] in keys:
                         continue
 
-                    # The value.
-                    value = data[mf_bmrb_key[j]][i]
-
-                    # The parameter.
-                    param = mf_params[j]
-
-                    # Change the parameter name of te to ts.
-                    if param == 'te':
-                        if (data['s2s'] and data['s2s'][i] != None) or 
(data['s2f'] and data['s2f'][i] != None):
-                            param = 'ts'
-
-                    # Parameter scaling.
-                    if value != None:
-                        if param == 'te':
-                            value = value * te_scale
-                        elif param == 'tf':
-                            value = value * tf_scale
-                        elif param == 'ts':
-                            value = value * ts_scale
-                        elif param == 'rex':
-                            value = value * rex_scale
+                    # The parameter and its value.
+                    if data[mf_bmrb_key[j]] != None:
+                        # The value.
+                        value = data[mf_bmrb_key[j]][i]
+
+                        # The parameter.
+                        param = mf_params[j]
+
+                        # A te value which should be ts!
+                        if param == 'te' and not hasattr(spin, 'te'):
+                            if (data['s2s'] and data['s2s'][i] != None) or 
(data['s2f'] and data['s2f'][i] != None):
+                                # Change the parameter name of te to ts.
+                                param = 'ts'
+
+                                # Set the te and te_err values to None.
+                                spin.te = None
+                                spin.te_err = None
+
+                        # Parameter scaling.
+                        if value != None:
+                            if param == 'te':
+                                value = value * te_scale
+                            elif param == 'tf':
+                                value = value * tf_scale
+                            elif param == 'ts':
+                                value = value * ts_scale
+                            elif param == 'rex':
+                                value = value * rex_scale
+
+                    # No parameter value.
+                    else:
+                        value = None
 
                     # Set the parameter.
                     setattr(spin, param, value)