r6764 - /1.3/specific_fns/model_free/main.py -- July 05, 2008 - 19:29

Author: bugman
Date: Sat Jul  5 19:29:14 2008
New Revision: 6764

URL: http://svn.gna.org/viewcvs/relax?rev=6764&view=rev
Log:
Fix for the model_setup() method.

The diffusion tensor was incorrectly referenced and the model, parameters, 
and equation were not
always being set.


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=6764&r1=6763&r2=6764&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sat Jul  5 19:29:14 2008
@@ -1564,10 +1564,9 @@
         """
 
         # Test that no diffusion tensor exists if local tm is a parameter in 
the model.
-        if params:
-            for param in params:
-                if param == 'local_tm' and hasattr(ds, 'diff'):
-                    raise RelaxTensorError, 'diffusion'
+        for param in params:
+            if param == 'local_tm' and hasattr(ds, 'diff_tensor'):
+                raise RelaxTensorError, 'diffusion'
 
         # Loop over the sequence.
         for spin in spin_loop(spin_id):
@@ -1575,12 +1574,9 @@
             self.data_init(spin)
 
             # Model-free model, equation, and parameter types.
-            if model:
-                spin.model = model
-            if equation:
-                spin.equation = equation
-            if params:
-                spin.params = params
+            spin.model = model
+            spin.equation = equation
+            spin.params = params
 
 
     def model_statistics(self, instance=None, spin_id=None, 
global_stats=None):