mailr11907 - /1.3/specific_fns/model_free/results.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on December 20, 2010 - 14:46:
Author: bugman
Date: Mon Dec 20 14:46:26 2010
New Revision: 11907

URL: http://svn.gna.org/viewcvs/relax?rev=11907&view=rev
Log:
For the 1.2 results files, the model information is now being setup even if 
None.


Modified:
    1.3/specific_fns/model_free/results.py

Modified: 1.3/specific_fns/model_free/results.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/results.py?rev=11907&r1=11906&r2=11907&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/results.py (original)
+++ 1.3/specific_fns/model_free/results.py Mon Dec 20 14:46:26 2010
@@ -226,9 +226,13 @@
         if data_set == 'value':
             # Get the model-free model.
             model = spin_line[col['model']]
+            if model == 'None':
+                model = None
 
             # Get the model-free equation.
             equation = spin_line[col['eqi']]
+            if equation == 'None':
+                equation = None
 
             # Get the model-free parameters.
             params = eval(spin_line[col['params']])
@@ -240,8 +244,7 @@
                         params[i] = 'local_tm'
 
             # Set up the model-free model.
-            if model and equation:
-                self._model_setup(model=model, equation=equation, 
params=params, spin_id=spin_id)
+            self._model_setup(model=model, equation=equation, params=params, 
spin_id=spin_id)
 
         # The model type.
         model_type = spin_line[col['param_set']]




Related Messages


Powered by MHonArc, Updated Mon Dec 20 15:20:02 2010