Author: tlinnet
Date: Wed Jun 25 03:41:04 2014
New Revision: 24306
URL: http://svn.gna.org/viewcvs/relax?rev=24306&view=rev
Log:
Small fix for making sure that power is a integer in ns mmq 2site.
Following system tests was failing.
- Relax_disp.test_korzhnev_2005_15n_dq_data
- Relax_disp.test_korzhnev_2005_15n_sq_data
- Relax_disp.test_korzhnev_2005_15n_zq_data
- Relax_disp.test_korzhnev_2005_1h_sq_data
- Relax_disp.test_korzhnev_2005_all_data
- Relax_disp.test_korzhnev_2005_all_data_disp_speed_bug
They should already be integers, but is now solved.
Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion
models for Clustered analysis.
Modified:
branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py?rev=24306&r1=24305&r2=24306&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py Wed Jun 25
03:41:04 2014
@@ -223,7 +223,7 @@
# Loop over the time points, back calculating the R2eff
values.
for i in range(num_points_i):
# Extract data from array.
- power_i = power[si, mi, oi, i]
+ power_i = int(power[si, mi, oi, i])
M1_M2_i = M1_M2_mat[si, mi, oi, i]
M1_M2_star_i = M1_M2_star_mat[si, mi, oi, i]
M2_M1_i = M2_M1_mat[si, mi, oi, i]
@@ -371,7 +371,7 @@
# Loop over the time points, back calculating the R2eff
values.
for i in range(num_points_i):
# Extract data from array.
- power_i = power[si, mi, oi, i]
+ power_i = int(power[si, mi, oi, i])
evol_block_i = evol_block_mat[si, mi, oi, i]
# The full evolution.
r24306 - /branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py