Author: bugman
Date: Mon Jan 25 12:57:07 2010
New Revision: 10303
URL: http://svn.gna.org/viewcvs/relax?rev=10303&view=rev
Log:
Merged revisions 10296-10302 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r10296 | bugman | 2010-01-25 11:13:06 +0100 (Mon, 25 Jan 2010) | 14 lines
Spun out the automatic model-free protocol code from the full_analysis.py
script.
This is discussed in the post
https://mail.gna.org/public/relax-devel/2010-01/msg00075.html.
The aim is to have a single code base for the automatic protocols for all
UI designs (prompt,
script, GUI, web interface, etc.). The API interface will be via class
initialisations. The
automatic model-free protocol has been placed into the dAuvergne_protocol
class.
Future aims of this code is to have the UI fill a single data pipe with all
the data required for
the analysis, and then to pass in this pipe into the protocol. Then the
auto-analysis will copy
this info into any other data pipes it requires. This will allow for
better GUI interaction, data
display, etc.
........
r10297 | bugman | 2010-01-25 11:33:22 +0100 (Mon, 25 Jan 2010) | 3 lines
Removed all the now unused imports and a useless comment.
........
r10298 | bugman | 2010-01-25 11:34:54 +0100 (Mon, 25 Jan 2010) | 3 lines
Updated the copyright notice.
........
r10299 | bugman | 2010-01-25 11:37:25 +0100 (Mon, 25 Jan 2010) | 3 lines
Fixed the import of the dAuvergne_protocol class.
........
r10300 | bugman | 2010-01-25 12:13:59 +0100 (Mon, 25 Jan 2010) | 3 lines
Modifications to the phthalic_acid_noes.py system test script to allow for
standalone operation.
........
r10301 | bugman | 2010-01-25 12:40:54 +0100 (Mon, 25 Jan 2010) | 5 lines
Fixes for the N-state model for when only NOEs are present.
This fixes a bug introduced at r10243.
........
r10302 | bugman | 2010-01-25 12:54:34 +0100 (Mon, 25 Jan 2010) | 5 lines
Bug fix for the bug fix of r10301!
The bug fix actually introduced a bug, and this commit fixes that!
........
Added:
branches/bieri_gui/auto_analyses/
- copied from r10302, 1.3/auto_analyses/
Modified:
branches/bieri_gui/ (props changed)
branches/bieri_gui/sample_scripts/full_analysis.py
branches/bieri_gui/specific_fns/n_state_model.py
branches/bieri_gui/test_suite/system_tests/scripts/phthalic_acid_noes.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/bieri_gui/sample_scripts/full_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/sample_scripts/full_analysis.py?rev=10303&r1=10302&r2=10303&view=diff
Modified: branches/bieri_gui/specific_fns/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/n_state_model.py?rev=10303&r1=10302&r2=10303&view=diff
Modified:
branches/bieri_gui/test_suite/system_tests/scripts/phthalic_acid_noes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/test_suite/system_tests/scripts/phthalic_acid_noes.py?rev=10303&r1=10302&r2=10303&view=diff
r10303 - in /branches/bieri_gui: ./ auto_analyses/ sample_scripts/ specific_fns/ test_suite/system_tests/scripts/