mailr23854 - /branches/disp_spin_speed/lib/dispersion/b14.py


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

Header


Content

Posted by tlinnet on June 11, 2014 - 20:43:
Author: tlinnet
Date: Wed Jun 11 20:43:47 2014
New Revision: 23854

URL: http://svn.gna.org/viewcvs/relax?rev=23854&view=rev
Log:
Comment fix for finding when E0 is above 700 in lib function of B14.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/b14.py

Modified: branches/disp_spin_speed/lib/dispersion/b14.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/b14.py?rev=23854&r1=23853&r2=23854&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/b14.py      (original)
+++ branches/disp_spin_speed/lib/dispersion/b14.py      Wed Jun 11 20:43:47 
2014
@@ -150,9 +150,9 @@
     @type num_points:       int
     """
 
-    # Flag to tell if values should be replaced if max_e_zero in cosh 
function is violated.
+    # Flag to tell if values should be replaced if math function is violated.
     t_dw_zero = False
-    t_max_e_zero = False
+    t_max_e = False
     t_v3_N_zero = False
     t_log_tog_neg = False
 
@@ -216,10 +216,10 @@
     # Catch math domain error of sinh(val > 710).
     # This is when E0 > 710.
     if max(E0) > 700:
-        t_max_e_zero = True
-        mask_max_e_zero = masked_greater_equal(E0, 700.0)
+        t_max_e = True
+        mask_max_e = masked_greater_equal(E0, 700.0)
         # To prevent math errors, set e_zero to 1.
-        E0[mask_max_e_zero.mask] = 1.0
+        E0[mask_max_e.mask] = 1.0
 
     # Derived from chemical shifts  #E2 = complex(0,-2.0 * tcp * (F00I - 
f11I)).
     E2 =  two_tcp * g4
@@ -283,9 +283,9 @@
     if t_dw_zero:
         back_calc[mask_dw_zero.mask] = r20a[mask_dw_zero.mask]
 
-    # If eta_pos above 700.
-    if t_max_e_zero:
-        back_calc[mask_max_e_zero.mask] = r20a[mask_max_e_zero.mask]
+    # If E0 is above 700.
+    if t_max_e:
+        back_calc[mask_max_e.mask] = r20a[mask_max_e.mask]
 
     # If Tog_div is zero.
     if t_v3_N_zero:




Related Messages


Powered by MHonArc, Updated Wed Jun 11 21:00:03 2014