relax SVN archive

Fixes for a bad update and merger from upstream.

Some imports were lost in the specific_analyses.relax_disp.model module.

The dispersion back_calc_r2eff() function can now handle the dynamic R1 parameter.

This required a call to r1_setup() to add or remove the parameter, and is_r1_optimised() to obtain
the r1_fit flag to be sent into the target function class.

The dispersion loop_parameter() function now calls r1_setup() to handle R1 parameters correctly.

This allows the R1 parameter to be removed or added to the parameter list prior to looping over the
parameters of the model. The change is required to allow for the dynamic handling of R1 parameters.

The dispersion auto-analysis now handles the optional R1 parameter correctly.

The value.set user function was no longer setting the R1 parameter to the default value when the
grid search was deactivated, as it is no longer in MODEL_PARAMS. So instead the new
is_r1_optimised() function is being used to decide if the value.set user function should set the
'r1' parameter value.

The specific_analyses.relax_disp.parameters.r1_setup() function is now being called.

This happens before the R1 data is returned in the Disp_minimise_command class.

Missing import in the specific_analyses.relax_disp.parameters module.

This was preventing the r1_setup() function from working.

Modified the MODEL_LIST_R1RHO_OFF_RES list to include MODEL_NOREX_R1RHO.

Import fix for the specific_analyses.relax_disp.model module.

One of the dispersion variables were lost.

Import fix for the Relax_disp.test_model_nesting_and_param system test.

Somehow the import of the convert_no_rex() function was lost.

Fix for the MODEL_LIST_R1RHO variable.

Recent changes causes this to not include the on-resonance R1rho dispersion models.