r12815 - /1.3/specific_fns/model_free/bmrb.py -- March 17, 2011 - 15:20

Author: bugman
Date: Thu Mar 17 15:20:13 2011
New Revision: 12815

URL: http://svn.gna.org/viewcvs/relax?rev=12815&view=rev
Log:
The te parameter is now properly converted to ts is the model is one of m5, 
m6, m7, or m8.


Modified:
    1.3/specific_fns/model_free/bmrb.py

Modified: 1.3/specific_fns/model_free/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/bmrb.py?rev=12815&r1=12814&r2=12815&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/bmrb.py (original)
+++ 1.3/specific_fns/model_free/bmrb.py Thu Mar 17 15:20:13 2011
@@ -191,16 +191,6 @@
                         # The value.
                         value = data[mf_bmrb_key[j]][i]
 
-                        # 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':
@@ -250,6 +240,17 @@
                     equation, params = self._model_map(model)
                     setattr(spin, 'equation', equation)
                     setattr(spin, 'params', params)
+
+                # Convert te values which should be ts!
+                if spin.model in ['m5', 'm6', 'm7', 'm8'] and hasattr(spin, 
'te') and spin.te != None:
+                    # Change the parameter name of te to ts.
+                    spin.ts = spin.te
+                    if hasattr(spin, 'te_err'):
+                        spin.ts_err = spin.te_err
+
+                    # Set the te and te_err values to None.
+                    spin.te = None
+                    spin.te_err = None
 
                 # The element.
                 if'atom_types' in keys and data['atom_types'] != None: