r21502 - in /branches/relax_disp: specific_analyses/relax_disp/ test_suite/shared_data/saved_states/ test_suite/system_tests/ -- November 18, 2013 - 16:34

Author: bugman
Date: Mon Nov 18 16:34:55 2013
New Revision: 21502

URL: http://svn.gna.org/viewcvs/relax?rev=21502&view=rev
Log:
Converted the spin specific 'r2', 'r2a', and 'r2b' dispersion parameters from 
lists to dictionaries.

The new parameter keys are based on the experiment type and the spectrometer 
frequency.  These keys
are supported by the generate_r20_key() and decompose_r20_key() pair of 
functions in the
specific_analyses.relax_disp.disp_data module.  This enables support for 
different R20 parameters
for each experiment type - a key piece of infrastructure for the MMQ models.

The relax_disp.select_model user function backend was modified so the 
parameter list only contains
one instance for each of the 'r2', 'r2a', or 'r2b' strings.

The specific_analyses.relax_disp.parameters.loop_parameters() function was 
modified so that the R20
key rather than frequency index is returned for the R20 parameters.  Many 
other code changes were
required.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py
    branches/relax_disp/specific_analyses/relax_disp/optimisation.py
    branches/relax_disp/specific_analyses/relax_disp/parameters.py
    
branches/relax_disp/test_suite/shared_data/saved_states/bug_21081_disp_cluster_fail.bz2
    branches/relax_disp/test_suite/system_tests/relax_disp.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=21502&r1=21501&r2=21502&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=21502&r1=21501&r2=21502&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/optimisation.py?rev=21502&r1=21501&r2=21502&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/parameters.py?rev=21502&r1=21501&r2=21502&view=diff

Modified: 
branches/relax_disp/test_suite/shared_data/saved_states/bug_21081_disp_cluster_fail.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/saved_states/bug_21081_disp_cluster_fail.bz2?rev=21502&r1=21501&r2=21502&view=diff

Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=21502&r1=21501&r2=21502&view=diff