r2737 - /1.3/specific_fns/model_free.py -- November 04, 2006 - 07:00

Author: bugman
Date: Sat Nov  4 06:52:05 2006
New Revision: 2737

URL: http://svn.gna.org/viewcvs/relax?rev=2737&view=rev
Log:
Ported r2736 from the 1.2 line to fix bug #7587 
(https://gna.org/bugs/index.php?7587).

The command used was:
svn merge -r2735:2736 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2


Modified:
    1.3/specific_fns/model_free.py

Modified: 1.3/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=2737&r1=2736&r2=2737&view=diff
==============================================================================
--- 1.3/specific_fns/model_free.py (original)
+++ 1.3/specific_fns/model_free.py Sat Nov  4 06:52:05 2006
@@ -2927,9 +2927,21 @@
 
         # Set up the model-free models.
         if self.data_set == 'value':
+            # Get the model-free model.
             model = self.file_line[self.col['model']]
+
+            # Get the model-free equation.
             equation = self.file_line[self.col['eqi']]
+
+            # Get the model-free parameters.
             params = eval(self.file_line[self.col['params']])
+
+            # Fix for the 1.2 relax versions whereby the parameter 'tm' was 
renamed to 'local_tm' (which occurred in version 1.2.5).
+            for i in xrange(len(params)):
+                if params[i] == 'tm':
+                    params[i] = 'local_tm'
+
+            # Set up the model-free model.
             if model and equation:
                 self.model_setup(self.run, model=model, equation=equation, 
params=params, res_num=self.res_num)