Author: bugman
Date: Tue Mar 18 17:09:32 2014
New Revision: 22507
URL: http://svn.gna.org/viewcvs/relax?rev=22507&view=rev
Log:
Merged revisions 22492,22498-22499,22501-22502 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22492 | tlinnet | 2014-03-17 14:30:51 +0100 (Mon, 17 Mar 2014) | 4 lines
Replaced funtion atan(omega1 / Delta_omega) with atan2(omega1 ,
Delta_omega), to make sure returned theta values are between 0 and pi.
This was done in the function return_offset_data() in the specific_analyses
of relax_disp.
This was discussed in:
http://thread.gmane.org/gmane.science.nmr.relax.devel/5210.
........
r22498 | tlinnet | 2014-03-17 18:18:59 +0100 (Mon, 17 Mar 2014) | 1 line
Changed a unit test and systemtest, where a change from the atan to atan2
function to calculate theta can give differences to the 15 decimal.
........
r22499 | tlinnet | 2014-03-17 18:19:01 +0100 (Mon, 17 Mar 2014) | 4 lines
Replaced how a global analysis average results from a previous run to
instead take the median.
This is to prevent averaging extreme outliers, and instead take the median
of the previous result.
This was discussed in:
https://mail.gna.org/public/relax-devel/2013-10/msg00009.html.
........
r22501 | tlinnet | 2014-03-18 16:06:01 +0100 (Tue, 18 Mar 2014) | 1 line
Modified systemtest Relax_disp.test_r1rho_kjaergaard to use input guess
values of phi_ex in units of ppm^2 instead of rad^2/s^2.
........
r22502 | tlinnet | 2014-03-18 16:47:56 +0100 (Tue, 18 Mar 2014) | 4 lines
Small change to systemtest Relax_disp.test_r1rho_kjaergaard.
The outcome of kex from systemtest is in the area of 4-5000. The expected
value is 13000.
A deeer analysis of the input is needed, to judge what is the correct value.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/specific_analyses/relax_disp/disp_data.py
branches/double_rotor/specific_analyses/relax_disp/parameters.py
branches/double_rotor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/R1_fitted_values.txt
branches/double_rotor/test_suite/system_tests/relax_disp.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/double_rotor/specific_analyses/relax_disp/disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/disp_data.py?rev=22507&r1=22506&r2=22507&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/parameters.py?rev=22507&r1=22506&r2=22507&view=diff
Modified:
branches/double_rotor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/R1_fitted_values.txt
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/R1_fitted_values.txt?rev=22507&r1=22506&r2=22507&view=diff
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=22507&r1=22506&r2=22507&view=diff
Modified:
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22507&r1=22506&r2=22507&view=diff
r22507 - in /branches/double_rotor: ./ specific_analyses/relax_disp/ test_suite/shared_data/dispersion/Kjaergaard_et_al_2013...