Author: tlinnet
Date: Wed Feb 26 16:21:12 2014
New Revision: 22342
URL: http://svn.gna.org/viewcvs/relax?rev=22342&view=rev
Log:
Fix for wrong values of "1341.11" in unit test.
Regarding bug #21344, (https://gna.org/bugs/index.php?21344) - Handling of in
sparse acquired R1rho dataset with missing combinations of time and spin-lock
field strengths.
Replaced 1341.10, and 1341.10 with 1341.11.
Modified:
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
Modified:
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22342&r1=22341&r2=22342&view=diff
==============================================================================
---
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
(original)
+++
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
Wed Feb 26 16:21:12 2014
@@ -115,31 +115,31 @@
'32_0_43_10':['R1rho', 799777399.1, 118.078, 984.0, 0.1],
'35_0_43_20':['R1rho', 799777399.1, 118.078, 984.0, 0.2],
'33_0_43_40':['R1rho', 799777399.1, 118.078, 984.0, 0.4],
- '1_0_46_0':['R1rho', 799777399.1, 118.078, 1341.10, 0.0],
- '4_0_46_4':['R1rho', 799777399.1, 118.078, 1341.10, 0.04],
- '2_0_46_10':['R1rho', 799777399.1, 118.078, 1341.10, 0.1],
- '5_0_46_20':['R1rho', 799777399.1, 118.078, 1341.10, 0.2],
- '3_0_46_40':['R1rho', 799777399.1, 118.078, 1341.10, 0.4],
+ '1_0_46_0':['R1rho', 799777399.1, 118.078, 1341.11, 0.0],
+ '4_0_46_4':['R1rho', 799777399.1, 118.078, 1341.11, 0.04],
+ '2_0_46_10':['R1rho', 799777399.1, 118.078, 1341.11, 0.1],
+ '5_0_46_20':['R1rho', 799777399.1, 118.078, 1341.11, 0.2],
+ '3_0_46_40':['R1rho', 799777399.1, 118.078, 1341.11, 0.4],
'60_0_48_0':['R1rho', 799777399.1, 118.078, 1648.5, 0.0],
'63_0_48_4':['R1rho', 799777399.1, 118.078, 1648.5, 0.04],
'61_0_48_10':['R1rho', 799777399.1, 118.078, 1648.5, 0.1],
'62_0_48_14':['R1rho', 799777399.1, 118.078, 1648.5, 0.14],
'64_0_48_20':['R1rho', 799777399.1, 118.078, 1648.5, 0.2],
- '11_500_46_0':['R1rho', 799777399.1, 124.24703146206046, 1341.10,
0.0],
- '14_500_46_4':['R1rho', 799777399.1, 124.24703146206046, 1341.10,
0.04],
- '12_500_46_10':['R1rho', 799777399.1, 124.24703146206046, 1341.10,
0.1],
- '15_500_46_20':['R1rho', 799777399.1, 124.24703146206046, 1341.10,
0.2],
- '13_500_46_40':['R1rho', 799777399.1, 124.24703146206046, 1341.10,
0.4],
+ '11_500_46_0':['R1rho', 799777399.1, 124.24703146206046, 1341.11,
0.0],
+ '14_500_46_4':['R1rho', 799777399.1, 124.24703146206046, 1341.11,
0.04],
+ '12_500_46_10':['R1rho', 799777399.1, 124.24703146206046, 1341.11,
0.1],
+ '15_500_46_20':['R1rho', 799777399.1, 124.24703146206046, 1341.11,
0.2],
+ '13_500_46_40':['R1rho', 799777399.1, 124.24703146206046, 1341.11,
0.4],
'50_1000_41_0':['R1rho', 799777399.1, 130.41606292412092, 800.5,
0.0],
'53_1000_41_4':['R1rho', 799777399.1, 130.41606292412092, 800.5,
0.04],
'51_1000_41_10':['R1rho', 799777399.1, 130.41606292412092, 800.5,
0.1],
'54_1000_41_20':['R1rho', 799777399.1, 130.41606292412092, 800.5,
0.2],
'52_1000_41_40':['R1rho', 799777399.1, 130.41606292412092, 800.5,
0.4],
- '21_1000_46_0':['R1rho', 799777399.1, 130.41606292412092, 1341.10,
0.0],
- '24_1000_46_4':['R1rho', 799777399.1, 130.41606292412092, 1341.10,
0.04],
- '22_1000_46_10':['R1rho', 799777399.1, 130.41606292412092, 1341.10,
0.1],
- '25_1000_46_20':['R1rho', 799777399.1, 130.41606292412092, 1341.10,
0.2],
- '23_1000_46_40':['R1rho', 799777399.1, 130.41606292412092, 1341.10,
0.4],
+ '21_1000_46_0':['R1rho', 799777399.1, 130.41606292412092, 1341.11,
0.0],
+ '24_1000_46_4':['R1rho', 799777399.1, 130.41606292412092, 1341.11,
0.04],
+ '22_1000_46_10':['R1rho', 799777399.1, 130.41606292412092, 1341.11,
0.1],
+ '25_1000_46_20':['R1rho', 799777399.1, 130.41606292412092, 1341.11,
0.2],
+ '23_1000_46_40':['R1rho', 799777399.1, 130.41606292412092, 1341.11,
0.4],
'65_1000_48_0':['R1rho', 799777399.1, 130.41606292412092, 1648.5,
0.0],
'68_1000_48_4':['R1rho', 799777399.1, 130.41606292412092, 1648.5,
0.04],
'66_1000_48_10':['R1rho', 799777399.1, 130.41606292412092, 1648.5,
0.1],
@@ -150,28 +150,28 @@
'56_2000_41_10':['R1rho', 799777399.1, 142.75412584824184, 800.5,
0.1],
'59_2000_41_20':['R1rho', 799777399.1, 142.75412584824184, 800.5,
0.2],
'57_2000_41_40':['R1rho', 799777399.1, 142.75412584824184, 800.5,
0.4],
- '6_2000_46_0':['R1rho', 799777399.1, 142.75412584824184, 1341.10,
0.0],
- '9_2000_46_4':['R1rho', 799777399.1, 142.75412584824184, 1341.10,
0.04],
- '7_2000_46_10':['R1rho', 799777399.1, 142.75412584824184, 1341.10,
0.1],
- '10_2000_46_20':['R1rho', 799777399.1, 142.75412584824184, 1341.10,
0.2],
- '8_2000_46_40':['R1rho', 799777399.1, 142.75412584824184, 1341.10,
0.4],
- '16_5000_46_0':['R1rho', 799777399.1, 179.76831462060457, 1341.10,
0.0],
- '19_5000_46_4':['R1rho', 799777399.1, 179.76831462060457, 1341.10,
0.04],
- '17_5000_46_10':['R1rho', 799777399.1, 179.76831462060457, 1341.10,
0.1],
- '20_5000_46_20':['R1rho', 799777399.1, 179.76831462060457, 1341.10,
0.2],
- '18_5000_46_40':['R1rho', 799777399.1, 179.76831462060457, 1341.10,
0.4],
- '26_10000_46_0':['R1rho', 799777399.1, 241.45862924120914, 1341.10,
0.0],
- '29_10000_46_4':['R1rho', 799777399.1, 241.45862924120914, 1341.10,
0.04],
- '27_10000_46_10':['R1rho', 799777399.1, 241.45862924120914, 1341.10,
0.1],
- '30_10000_46_20':['R1rho', 799777399.1, 241.45862924120914, 1341.10,
0.2],
- '28_10000_46_40':['R1rho', 799777399.1, 241.45862924120914, 1341.10,
0.4]}
+ '6_2000_46_0':['R1rho', 799777399.1, 142.75412584824184, 1341.11,
0.0],
+ '9_2000_46_4':['R1rho', 799777399.1, 142.75412584824184, 1341.11,
0.04],
+ '7_2000_46_10':['R1rho', 799777399.1, 142.75412584824184, 1341.11,
0.1],
+ '10_2000_46_20':['R1rho', 799777399.1, 142.75412584824184, 1341.11,
0.2],
+ '8_2000_46_40':['R1rho', 799777399.1, 142.75412584824184, 1341.11,
0.4],
+ '16_5000_46_0':['R1rho', 799777399.1, 179.76831462060457, 1341.11,
0.0],
+ '19_5000_46_4':['R1rho', 799777399.1, 179.76831462060457, 1341.11,
0.04],
+ '17_5000_46_10':['R1rho', 799777399.1, 179.76831462060457, 1341.11,
0.1],
+ '20_5000_46_20':['R1rho', 799777399.1, 179.76831462060457, 1341.11,
0.2],
+ '18_5000_46_40':['R1rho', 799777399.1, 179.76831462060457, 1341.11,
0.4],
+ '26_10000_46_0':['R1rho', 799777399.1, 241.45862924120914, 1341.11,
0.0],
+ '29_10000_46_4':['R1rho', 799777399.1, 241.45862924120914, 1341.11,
0.04],
+ '27_10000_46_10':['R1rho', 799777399.1, 241.45862924120914, 1341.11,
0.1],
+ '30_10000_46_20':['R1rho', 799777399.1, 241.45862924120914, 1341.11,
0.2],
+ '28_10000_46_40':['R1rho', 799777399.1, 241.45862924120914, 1341.11,
0.4]}
time_comp = {
'118.078_431.0':4,
'118.078_651.2':5,
'118.078_800.5':5,
'118.078_984.0':5,
- '118.078_1341.1':5,
+ '118.078_1341.11':5,
'118.078_1648.5':5,
'124.247031462_1341.11':5,
'130.416062924_800.5':5,
@@ -547,16 +547,16 @@
[118.078, 651.2, [0.0, 0.04, 0.1, 0.2, 0.4]],
[118.078, 800.5, [0.0, 0.04, 0.1, 0.2, 0.4]],
[118.078, 984.0, [0.0, 0.04, 0.1, 0.2, 0.4]],
- [118.078, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]],
+ [118.078, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]],
[118.078, 1648.5, [0.0, 0.04, 0.1, 0.14, 0.2]],
- [124.247031462, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]],
+ [124.247031462, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]],
[130.416062924, 800.5, [0.0, 0.04, 0.1, 0.2, 0.4]],
- [130.416062924, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]],
+ [130.416062924, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]],
[130.416062924, 1648.5, [0.0, 0.04, 0.1, 0.14, 0.2]],
[142.754125848, 800.5, [0.0, 0.04, 0.1, 0.2, 0.4]],
- [142.754125848, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]],
- [179.768314621, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]],
- [241.458629241, 1341.1, [0.0, 0.04, 0.1, 0.2, 0.4]]]
+ [142.754125848, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]],
+ [179.768314621, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]],
+ [241.458629241, 1341.11, [0.0, 0.04, 0.1, 0.2, 0.4]]]
# Check the number of iterations.
r22342 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py