r3307 - /1.3/specific_fns/model_free/model_free.py -- June 24, 2007 - 17:08

Author: bugman
Date: Sun Jun 24 17:08:03 2007
New Revision: 3307

URL: http://svn.gna.org/viewcvs/relax?rev=3307&view=rev
Log:
Ported r3293 from the 1.2 line.

The command used was:
svn merge -r3292:3293 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2/specific_fns/model_free.py 
specific_fns/model_free/model_free.py

.....
 r3293 | bugman | 2007-05-09 00:59:17 +0200 (Wed, 09 May 2007) | 7 lines
 Changed paths:
    M /1.2/specific_fns/model_free.py

 Bug fix.

 The reading of model-free results files was failing for residues with the 
parameters vector of None
 (as well as the parameter set set to None and the model-free equation set to 
None).  This situation
 occurs after model selection when the residue is deselected.
.....


Modified:
    1.3/specific_fns/model_free/model_free.py

Modified: 1.3/specific_fns/model_free/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=3307&r1=3306&r2=3307&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Sun Jun 24 17:08:03 2007
@@ -2493,9 +2493,10 @@
         """Function for updating various data structures depending on the 
model selected."""
 
         # Test that no diffusion tensor exists for the run if local tm is a 
parameter in the model.
-        for param in params:
-            if param == 'local_tm' and relax_data_store.diff.has_key(run):
-                raise RelaxTensorError, run
+        if params:
+            for param in params:
+                if param == 'local_tm' and 
relax_data_store.diff.has_key(run):
+                    raise RelaxTensorError, run
 
         # Loop over the sequence.
         for i in xrange(len(relax_data_store.res[run])):
@@ -2507,9 +2508,12 @@
             self.data_init(relax_data_store.res[run][i])
 
             # Model-free model, equation, and parameter types.
-            relax_data_store.res[run][i].model = model
-            relax_data_store.res[run][i].equation = equation
-            relax_data_store.res[run][i].params = params
+            if model:
+                relax_data_store.res[run][i].model = model
+            if equation:
+                relax_data_store.res[run][i].equation = equation
+            if params:
+                relax_data_store.res[run][i].params = params
 
 
     def model_statistics(self, run=None, instance=None, global_stats=None):
@@ -2951,9 +2955,10 @@
             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'
+            if params:
+                for i in xrange(len(params)):
+                    if params[i] == 'tm':
+                        params[i] = 'local_tm'
 
             # Set up the model-free model.
             if model and equation: