relax SVN archive

Merger of the 'No Rex' and 'No Rex R1rho off res' models in the specific_analyses.relax_disp package.

In the 'variables' module, all *_NOREX_R1RHO variables have simply been deleted and the MODEL_LIST_*
structures updated.

For the 'data' module, the is_r1_optimised() function was modified to catch the 'No Rex' model and
to then use the cdp.exp_type_list structure to determine if the experiment type is EXP_TYPE_R1RHO.
This will be modified in the future by using a function for determining if the current experiment is
on or off-resonance. The return_r1_data() and return_r1_err_data() functions have also been
modified to check if R1 values are fit rather than if the model is in MODEL_LIST_R1RHO_OFF_RES.

In the 'model' module, in addition to deleting all *_NOREX_R1RHO variables, the convert_no_rex()
function has also been deleted as it no longer serves a purpose.

In the 'checks' module, all 'No Rex R1rho off res' model references have been replaced with 'No
Rex'.

Altered the number of Monte-Carlo simulations in test script to 2000.

Removed results files to allow the Relax_disp.test_r1rho_kjaergaard_missing_r1 system test to pass.

These are the test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/check_graphs/mc_2000/ results
files for the 'No Rex' and 'DPL94' models, as well as the final run.

This commit is to allow the test to temporarily pass. It can be reverted once a better solution is
discussed and decided upon.

Updated the relax_disp.r1_fit user function docstring.

This now includes information about which models support R1 parameter optimisation.

Merged revisions 25152-25158 via svnmerge from
svn+ssh://bugman@.../svn/relax/trunk

........
r25152 | bugman | 2014-08-21 10:37:38 +0200 (Thu, 21 Aug 2014) | 3 lines

Created the MODEL_LIST_FIT_R1 variable to keep track of dispersion models with R1 fitting support.
........
r25153 | bugman | 2014-08-21 10:40:26 +0200 (Thu, 21 Aug 2014) | 6 lines

The is_r1_optimised() function now checks MODEL_LIST_FIT_R1.

If the model is not in MODEL_LIST_FIT_R1, i.e. R1 optimisation is not supported, then the function
will return False.
........
r25154 | bugman | 2014-08-21 10:42:58 +0200 (Thu, 21 Aug 2014) | 5 lines

Bug fix for the updating of the Model_class.params list with 'r1'.

The is_r1_optimised() function needs to be called!
........
r25155 | bugman | 2014-08-21 10:59:02 +0200 (Thu, 21 Aug 2014) | 3 lines

Removed some unused imports to allow the test_variables unit tests to pass.
........
r25156 | bugman | 2014-08-21 11:05:12 +0200 (Thu, 21 Aug 2014) | 5 lines

Removed all of the MODEL_*_FIT_R1 from the remaining unit tests.

These are for the tests of the specific_analyses.relax_disp.model module.
........
r25157 | bugman | 2014-08-21 11:08:52 +0200 (Thu, 21 Aug 2014) | 5 lines

Fix for the test_nesting_param_5 unit test.

The 'r1' parameter is now dynamic and hence will not be present in the initial list.
........
r25158 | bugman | 2014-08-21 11:21:12 +0200 (Thu, 21 Aug 2014) | 5 lines

One final fix for the Model_class.params list with 'r1'.

The is_r1_optimised() function is now called with the model name argument, as required.
........

One final fix for the Model_class.params list with 'r1'.

The is_r1_optimised() function is now called with the model name argument, as required.

Fix for the test_nesting_param_5 unit test.

The 'r1' parameter is now dynamic and hence will not be present in the initial list.

Removed all of the MODEL_*_FIT_R1 from the remaining unit tests.

These are for the tests of the specific_analyses.relax_disp.model module.

Removed some unused imports to allow the test_variables unit tests to pass.

Bug fix for the updating of the Model_class.params list with 'r1'.

The is_r1_optimised() function needs to be called!