Author: tlinnet
Date: Wed Jun 18 20:58:39 2014
New Revision: 24149
URL: http://svn.gna.org/viewcvs/relax?rev=24149&view=rev
Log:
Comment fixing, for explaining the masking and replacing when dw is zeroÃ.
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
branches/disp_spin_speed/lib/dispersion/cr72.py
branches/disp_spin_speed/lib/dispersion/it99.py
branches/disp_spin_speed/lib/dispersion/lm63_3site.py
branches/disp_spin_speed/lib/dispersion/mmq_cr72.py
branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py
branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
branches/disp_spin_speed/lib/dispersion/tsmfk01.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=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/b14.py (original)
+++ branches/disp_spin_speed/lib/dispersion/b14.py Wed Jun 18 20:58:39
2014
@@ -157,7 +157,7 @@
back_calc[:] = r20a
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/cr72.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/cr72.py (original)
+++ branches/disp_spin_speed/lib/dispersion/cr72.py Wed Jun 18 20:58:39
2014
@@ -137,7 +137,7 @@
back_calc[:] = r20a
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/it99.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/it99.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/it99.py (original)
+++ branches/disp_spin_speed/lib/dispersion/it99.py Wed Jun 18 20:58:39
2014
@@ -108,7 +108,7 @@
back_calc[:] = r20
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/lm63_3site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/lm63_3site.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/lm63_3site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/lm63_3site.py Wed Jun 18
20:58:39 2014
@@ -118,7 +118,7 @@
if t_quart_kB_zero and t_quart_kC_zero:
t_quart_kB_kC_zero = True
- # Test if rex is zero. Wait for replacement, since this is spin specific.
+ # Test if rex is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(rex_B)) == 0.0 and min(fabs(rex_C)) == 0.0:
t_rex_zero = True
mask_rex_B_zero = masked_where(rex_B == 0.0, rex_B)
Modified: branches/disp_spin_speed/lib/dispersion/mmq_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/mmq_cr72.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/mmq_cr72.py (original)
+++ branches/disp_spin_speed/lib/dispersion/mmq_cr72.py Wed Jun 18 20:58:39
2014
@@ -95,7 +95,7 @@
back_calc[:] = r20
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw and dwH is zero. Create a mask for the affected spins to
replace these with R20 at the end of the calculationWait for replacement,
since this is spin specific.
if min(fabs(dw)) == 0.0 and min(fabs(dwH)) == 0.0:
t_dw_dw_H_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py Wed Jun 18
20:58:39 2014
@@ -111,7 +111,7 @@
back_calc[:] = r20a
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py Wed
Jun 18 20:58:39 2014
@@ -276,7 +276,7 @@
back_calc[:] = r20
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py Wed
Jun 18 20:58:39 2014
@@ -114,7 +114,7 @@
back_calc[:] = r20a
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
Modified: branches/disp_spin_speed/lib/dispersion/tsmfk01.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/tsmfk01.py?rev=24149&r1=24148&r2=24149&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/tsmfk01.py (original)
+++ branches/disp_spin_speed/lib/dispersion/tsmfk01.py Wed Jun 18 20:58:39
2014
@@ -99,7 +99,7 @@
back_calc[:] = r20a
return
- # Test if dw is zero. Wait for replacement, since this is spin specific.
+ # Test if dw is zero. Create a mask for the affected spins to replace
these with R20 at the end of the calculationWait for replacement, since this
is spin specific.
if min(fabs(dw_orig)) == 0.0:
t_dw_zero = True
mask_dw_zero = masked_where(dw == 0.0, dw)
r24149 - /branches/disp_spin_speed/lib/dispersion/