r2439 - /branches/auto_select_merged/specific_fns/model_free.py -- April 05, 2006 - 04:23

Author: bugman
Date: Wed Apr  5 04:22:51 2006
New Revision: 2439

URL: http://svn.gna.org/viewcvs/relax?rev=2439&view=rev
Log:
Merged the change of revision 2397.

The command used was:
$ svn merge -r2395:2397 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2


Modified:
    branches/auto_select_merged/specific_fns/model_free.py

Modified: branches/auto_select_merged/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/specific_fns/model_free.py?rev=2439&r1=2438&r2=2439&view=diff
==============================================================================
--- branches/auto_select_merged/specific_fns/model_free.py (original)
+++ branches/auto_select_merged/specific_fns/model_free.py Wed Apr  5 
04:22:51 2006
@@ -1542,12 +1542,12 @@
         if self.param_set == 'diff' or self.param_set == 'all':
             # Spherical diffusion {tm}.
             if self.relax.data.diff[self.run].type == 'sphere':
-                min_options.append([inc[0], 6.0 * 1e-9, 12.0 * 1e-9])
+                min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
                 m = m + 1
 
             # Spheroidal diffusion {tm, Da, theta, phi}.
             if self.relax.data.diff[self.run].type == 'spheroid':
-                min_options.append([inc[0], 6.0 * 1e-9, 12.0 * 1e-9])
+                min_options.append([inc[0], 1.0 * 1e-9, 12.0 * 1e-9])
                 if self.relax.data.diff[self.run].spheroid_type == 'prolate':
                     min_options.append([inc[1], 0.0, 1e7])
                 elif self.relax.data.diff[self.run].spheroid_type == 
'oblate':
@@ -1560,7 +1560,7 @@
 
             # Ellipsoidal diffusion {tm, Da, Dr, alpha, beta, gamma}.
             elif self.relax.data.diff[self.run].type == 'ellipsoid':
-                min_options.append([inc[0], 6.0 * 1e-9, 12.0 * 1e-9])
+                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])
@@ -1583,7 +1583,7 @@
                 for j in 
xrange(len(self.relax.data.res[self.run][i].params)):
                     # Local tm.
                     if self.relax.data.res[self.run][i].params[j] == 'tm':
-                        min_options.append([inc[m], 6.0 * 1e-9, 12.0 * 1e-9])
+                        min_options.append([inc[m], 1.0 * 1e-9, 12.0 * 1e-9])
 
                     # {S2, S2f, S2s}.
                     elif match('S2', 
self.relax.data.res[self.run][i].params[j]):