mailr5171 - /1.3/specific_fns/model_free/mf_minimise.py


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

Header


Content

Posted by edward on March 23, 2008 - 01:23:
Author: bugman
Date: Sun Mar 23 01:23:39 2008
New Revision: 5171

URL: http://svn.gna.org/viewcvs/relax?rev=5171&view=rev
Log:
Whoops, removal of the old code which was shifted into a new function in 
r5170.


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=5171&r1=5170&r2=5171&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 01:23:39 2008
@@ -493,34 +493,6 @@
         if param_set == 'diff' or param_set == 'all':
             # Get the diffusion tensor specific configuration.
             m = self.grid_search_config_diff(min_options, inc, m)
-
-            # Spherical diffusion {tm}.
-            if cdp.diff.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':
-                min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
-                if cdp.diff.spheroid_type == 'prolate':
-                    min_options.append([inc[1], 0.0, 1e7])
-                elif cdp.diff.spheroid_type == 'oblate':
-                    min_options.append([inc[1], -1e7, 0.0])
-                else:
-                    min_options.append([inc[1], -1e7, 1e7])
-                min_options.append([inc[2], 0.0, pi])
-                min_options.append([inc[3], 0.0, pi])
-                m = m + 4
-
-            # Ellipsoidal diffusion {tm, Da, Dr, alpha, beta, gamma}.
-            elif cdp.diff.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])
-                min_options.append([inc[3], 0.0, pi])
-                min_options.append([inc[4], 0.0, pi])
-                min_options.append([inc[5], 0.0, pi])
-                m = m + 6
 
         # Model-free parameters (residue specific parameters).
         if param_set != 'diff':




Related Messages


Powered by MHonArc, Updated Sun Mar 23 02:00:15 2008