r6757 - /1.3/specific_fns/model_free/mf_minimise.py -- July 05, 2008 - 16:19

Author: bugman
Date: Sat Jul  5 16:19:25 2008
New Revision: 6757

URL: http://svn.gna.org/viewcvs/relax?rev=6757&view=rev
Log:
Fix for grid_search_config_diff().

The diffusion tensor is located in 'cdp.diff_tensor'.


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=6757&r1=6756&r2=6757&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sat Jul  5 16:19:25 2008
@@ -585,16 +585,16 @@
         cdp = ds[ds.current_pipe]
 
         # Spherical diffusion {tm}.
-        if cdp.diff.type == 'sphere':
+        if cdp.diff_tensor.type == 'sphere':
             min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
             m = m + 1
 
         # Spheroidal diffusion {tm, Da, theta, phi}.
-        if cdp.diff.type == 'spheroid':
+        if cdp.diff_tensor.type == 'spheroid':
             min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
-            if cdp.diff.spheroid_type == 'prolate':
+            if cdp.diff_tensor.spheroid_type == 'prolate':
                 min_options.append([inc[1], 0.0, 1e7])
-            elif cdp.diff.spheroid_type == 'oblate':
+            elif cdp.diff_tensor.spheroid_type == 'oblate':
                 min_options.append([inc[1], -1e7, 0.0])
             else:
                 min_options.append([inc[1], -1e7, 1e7])
@@ -603,7 +603,7 @@
             m = m + 4
 
         # Ellipsoidal diffusion {tm, Da, Dr, alpha, beta, gamma}.
-        elif cdp.diff.type == 'ellipsoid':
+        elif cdp.diff_tensor.type == 'ellipsoid':
             min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
             min_options.append([inc[1], 0.0, 1e7])
             min_options.append([inc[2], 0.0, 1.0])