Author: bugman
Date: Wed Mar 26 22:51:47 2014
New Revision: 22555
URL: http://svn.gna.org/viewcvs/relax?rev=22555&view=rev
Log:
Merged revisions 22553-22554 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22553 | bugman | 2014-03-26 22:28:12 +0100 (Wed, 26 Mar 2014) | 17 lines
Redesign and standardisation of the peak intensity data structure
throughout all analyses in relax.
The various structures 'intensities', 'intensity_err', 'intensity_sim',
'sim_intensity', and
'intensity_bc' have all been renamed. The new structures are called
'peak_intensity',
'peak_intensity_err', 'peak_intensity_sim' and 'peak_intensity_bc'. This
allows the structure to be
processed as a standard parameter in the specific analysis API. One very
visible consequence is
that plots of peak intensities, as well as value files, will now have peak
intensity errors.
For backwards compatibility, the relax data store method
_back_compat_hook() has been modified to
catch all previous peak intensity object variants and to standardise and
rename these to the new
object names.
As the parameter is now called 'peak_intensity' rather than 'intensities',
all calls to the
grace.write and value.write for this parameter have been changed in the
auto-analyses, the sample
scripts, the test suite and the manual.
........
r22554 | bugman | 2014-03-26 22:32:53 +0100 (Wed, 26 Mar 2014) | 5 lines
Fix for the Noe.test_noe_analysis system test.
The grace plots of the peak intensities now have error bars.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/auto_analyses/noe.py
branches/double_rotor/auto_analyses/relax_disp.py
branches/double_rotor/auto_analyses/relax_fit.py
branches/double_rotor/data_store/__init__.py
branches/double_rotor/docs/latex/curvefit.tex
branches/double_rotor/docs/latex/noe.tex
branches/double_rotor/pipe_control/spectrum.py
branches/double_rotor/sample_scripts/noe.py
branches/double_rotor/sample_scripts/relax_curve_diff.py
branches/double_rotor/sample_scripts/relax_fit.py
branches/double_rotor/specific_analyses/api_common.py
branches/double_rotor/specific_analyses/noe/api.py
branches/double_rotor/specific_analyses/relax_disp/api.py
branches/double_rotor/specific_analyses/relax_disp/disp_data.py
branches/double_rotor/specific_analyses/relax_disp/nessy.py
branches/double_rotor/specific_analyses/relax_disp/optimisation.py
branches/double_rotor/specific_analyses/relax_fit/__init__.py
branches/double_rotor/test_suite/gui_tests/noe.py
branches/double_rotor/test_suite/gui_tests/relax_disp.py
branches/double_rotor/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py
branches/double_rotor/test_suite/shared_data/dispersion/error_testing/simulation.py
branches/double_rotor/test_suite/system_tests/noe.py
branches/double_rotor/test_suite/system_tests/peak_lists.py
branches/double_rotor/test_suite/system_tests/relax_disp.py
branches/double_rotor/test_suite/system_tests/relax_fit.py
branches/double_rotor/test_suite/system_tests/scripts/1UBQ_relax_fit.py
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
branches/double_rotor/test_suite/system_tests/scripts/noe/noe.py
branches/double_rotor/test_suite/system_tests/scripts/relax_fit.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/double_rotor/auto_analyses/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/auto_analyses/noe.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/auto_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/auto_analyses/relax_disp.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/auto_analyses/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/auto_analyses/relax_fit.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/data_store/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/data_store/__init__.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/docs/latex/curvefit.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/docs/latex/curvefit.tex?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/docs/latex/noe.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/docs/latex/noe.tex?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/pipe_control/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/spectrum.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/sample_scripts/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/sample_scripts/noe.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/sample_scripts/relax_curve_diff.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/sample_scripts/relax_curve_diff.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/sample_scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/sample_scripts/relax_fit.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/api_common.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/noe/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/api.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/api.py?rev=22555&r1=22554&r2=22555&view=diff
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=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/nessy.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/nessy.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/optimisation.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/specific_analyses/relax_fit/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_fit/__init__.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/gui_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/gui_tests/noe.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/gui_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/gui_tests/relax_disp.py?rev=22555&r1=22554&r2=22555&view=diff
Modified:
branches/double_rotor/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/shared_data/bruker_files/relax_fit_pdc_err.py?rev=22555&r1=22554&r2=22555&view=diff
Modified:
branches/double_rotor/test_suite/shared_data/dispersion/error_testing/simulation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/shared_data/dispersion/error_testing/simulation.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/system_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/noe.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/peak_lists.py?rev=22555&r1=22554&r2=22555&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=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_fit.py?rev=22555&r1=22554&r2=22555&view=diff
Modified:
branches/double_rotor/test_suite/system_tests/scripts/1UBQ_relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/1UBQ_relax_fit.py?rev=22555&r1=22554&r2=22555&view=diff
Modified:
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/system_tests/scripts/noe/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/noe/noe.py?rev=22555&r1=22554&r2=22555&view=diff
Modified: branches/double_rotor/test_suite/system_tests/scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/relax_fit.py?rev=22555&r1=22554&r2=22555&view=diff
Modified:
branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py?rev=22555&r1=22554&r2=22555&view=diff
r22555 - in /branches/double_rotor: ./ auto_analyses/ data_store/ docs/latex/ pipe_control/ sample_scripts/ specific_analyse...