Author: bugman
Date: Wed Aug 20 15:56:02 2014
New Revision: 25095
URL: http://svn.gna.org/viewcvs/relax?rev=25095&view=rev
Log:
Merged revisions 25082-25094 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r25082 | tlinnet | 2014-08-19 17:14:05 +0200 (Tue, 19 Aug 2014) | 3 lines
Implemented the function, which translates how parameters are copied from a
nested model in the auto_analyses for relax_disp.
This makes it possible to test the translating code, and makes logic
clearer in the auto_analyses.
........
r25083 | tlinnet | 2014-08-19 17:14:07 +0200 (Tue, 19 Aug 2014) | 1 line
Renamed the class to big letter, and removed unnecessary code.
........
r25084 | bugman | 2014-08-19 17:33:19 +0200 (Tue, 19 Aug 2014) | 5 lines
Modified the r1rho_off_res_tp02_high_kex dispersion test data.
The kex value is now set to 2e5.
........
r25085 | bugman | 2014-08-19 18:26:38 +0200 (Tue, 19 Aug 2014) | 6 lines
Removed the 'DPL94 R1 fit' model nesting from the table in the dispersion
chapter of the manual.
This was identified using the dispersion test suite data script
print_model_info/print_model_info.py
(http://thread.gmane.org/gmane.science.nmr.relax.scm/22823).
........
r25086 | tlinnet | 2014-08-19 18:43:02 +0200 (Tue, 19 Aug 2014) | 7 lines
Added to systemtest Relax_disp.test_r1rho_kjaergaard_missing_r1 to check,
that values are not None when writing .out files.
This is related to:
https://gna.org/support/index.php?3121
sr #3121: Support request for replacing space in header files for the
value.write functions
The fix for this bug, destroyed getting the values.
........
r25087 | tlinnet | 2014-08-19 18:43:07 +0200 (Tue, 19 Aug 2014) | 7 lines
Fix for earlier bug fix destroyed functionality.
Altering the data-keys to early, meant that data was not fetched correctly.
This is related to:
https://gna.org/support/index.php?3121
sr #3121: Support request for replacing space in header files for the
value.write functions
........
r25088 | tlinnet | 2014-08-20 13:56:47 +0200 (Wed, 20 Aug 2014) | 3 lines
Moved the unit test of
specific_analyses.relax_disp.checks.check_missing_r1() from a unit test to a
system test.
This is because the unit test involved several functions of relax.
........
r25089 | tlinnet | 2014-08-20 13:56:50 +0200 (Wed, 20 Aug 2014) | 1 line
Inserted dictionary, that will convert a R1rho off-resonance without R1, to
the corresponding model which fit R1.
........
r25090 | tlinnet | 2014-08-20 13:56:52 +0200 (Wed, 20 Aug 2014) | 1 line
Inserted to the check of missing R1, that MODEL_NOREX_R1RHO also dependends
on R1.
........
r25091 | tlinnet | 2014-08-20 13:56:54 +0200 (Wed, 20 Aug 2014) | 2 lines
Implemented function that determine if any model in the list of all models
should be replaced or inserted as the correct 'No Rex' model.
It also translate the R1rho off-resonance model to the corresponding 'R1
fit' models, if R1 is not loaded.
........
r25092 | tlinnet | 2014-08-20 13:56:56 +0200 (Wed, 20 Aug 2014) | 2 lines
Inserted system test Relax_disp.test_convert_no_rex_fit_r1, which test the
return
for the function that will determine if models self.models in the
relax_disp should be translated/corrected.
........
r25093 | tlinnet | 2014-08-20 14:03:46 +0200 (Wed, 20 Aug 2014) | 3 lines
Fix for unit test, where the standard value of R1 was lowered from 5.0 to
2.0.
Also fixed an import error in another unit test.
........
r25094 | bugman | 2014-08-20 14:28:35 +0200 (Wed, 20 Aug 2014) | 5 lines
Minimised the dependencies of the version module.
This no longer relies on the dep_check module.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/auto_analyses/relax_disp.py
branches/frame_order_cleanup/docs/latex/dispersion.tex
branches/frame_order_cleanup/pipe_control/value.py
branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py
branches/frame_order_cleanup/specific_analyses/relax_disp/model.py
branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.log
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_800MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_500MHz.list
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_800MHz.list
branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_value.py
branches/frame_order_cleanup/test_suite/unit_tests/_specific_analyses/_relax_disp/test_checks.py
branches/frame_order_cleanup/version.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_cleanup/auto_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp.py?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/dispersion.tex?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/pipe_control/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/value.py?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/model.py?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.log
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.log?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/generate.py?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_1500.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_2500.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_3500.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_4500.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_5500.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_500MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_500MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_800MHz.list
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/r1rho_off_res_tp02_high_kex/nu_6000.0_800MHz.list?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_pipe_control/test_value.py?rev=25095&r1=25094&r2=25095&view=diff
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/_specific_analyses/_relax_disp/test_checks.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_specific_analyses/_relax_disp/test_checks.py?rev=25095&r1=25094&r2=25095&view=diff
Modified: branches/frame_order_cleanup/version.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/version.py?rev=25095&r1=25094&r2=25095&view=diff
r25095 - in /branches/frame_order_cleanup: ./ auto_analyses/ docs/latex/ pipe_control/ specific_analyses/relax_disp/ test_su...