r22610 - in /branches/double_rotor: ./ data_store/ gui/analyses/ lib/software/ pipe_control/ sample_scripts/n_state_model/ s...r22610 - in /branches/double_rotor: ./ data_store/ gui/analyses/ lib/software/ pipe_control/ sample_scripts/n_state_model/ s...Author: bugman Date: Fri Mar 28 23:23:58 2014 New Revision: 22610 URL: http://svn.gna.org/viewcvs/relax?rev=22610&view=rev Log: Merged revisions 22608-22609 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r22608 | bugman | 2014-03-28 22:01:56 +0100 (Fri, 28 Mar 2014) | 6 lines Fixes for the specific analysis API unit tests. The 'instance' variable used for the singleton design pattern is skipped in the method and object checks. ........ r22609 | bugman | 2014-03-28 22:03:42 +0100 (Fri, 28 Mar 2014) | 9 lines Redesign of the specific analysis API. All parts of relax using this API now work with the API objects directly. The specific_analyses.setup module has been renamed to specific_analyses.api and the get_specific_fn() function has been eliminated. Instead of calling this, the different parts of relax now obtain the API object by calling the new return_api() function. This results in a large cleanup of the API - method names are no longer changed to a different name. ........ Added: branches/double_rotor/specific_analyses/api.py - copied unchanged from r22609, trunk/specific_analyses/api.py Removed: branches/double_rotor/specific_analyses/setup.py Modified: branches/double_rotor/ (props changed) branches/double_rotor/data_store/interatomic.py branches/double_rotor/data_store/mol_res_spin.py branches/double_rotor/gui/analyses/auto_model_free.py branches/double_rotor/lib/software/grace.py branches/double_rotor/pipe_control/bmrb.py branches/double_rotor/pipe_control/eliminate.py branches/double_rotor/pipe_control/grace.py branches/double_rotor/pipe_control/minimise.py branches/double_rotor/pipe_control/model_selection.py branches/double_rotor/pipe_control/molmol.py branches/double_rotor/pipe_control/monte_carlo.py branches/double_rotor/pipe_control/opendx.py branches/double_rotor/pipe_control/plotting.py branches/double_rotor/pipe_control/pymol_control.py branches/double_rotor/pipe_control/relax_data.py branches/double_rotor/pipe_control/value.py branches/double_rotor/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py branches/double_rotor/sample_scripts/n_state_model/local_min_search.py branches/double_rotor/specific_analyses/__init__.py branches/double_rotor/specific_analyses/api_base.py branches/double_rotor/specific_analyses/frame_order/api.py branches/double_rotor/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py branches/double_rotor/user_functions/frame_order.py branches/double_rotor/user_functions/pipe.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/double_rotor/data_store/interatomic.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/data_store/interatomic.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/data_store/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/data_store/mol_res_spin.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/gui/analyses/auto_model_free.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/lib/software/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/lib/software/grace.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/bmrb.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/bmrb.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/eliminate.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/eliminate.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/grace.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/minimise.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/model_selection.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/molmol.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/molmol.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/monte_carlo.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/opendx.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/opendx.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/plotting.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/plotting.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/pymol_control.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/pymol_control.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/relax_data.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/pipe_control/value.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/value.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/sample_scripts/n_state_model/local_min_search.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/sample_scripts/n_state_model/local_min_search.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/specific_analyses/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/__init__.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/specific_analyses/api_base.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/api_base.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/specific_analyses/frame_order/api.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/frame_order/api.py?rev=22610&r1=22609&r2=22610&view=diff Removed: branches/double_rotor/specific_analyses/setup.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/setup.py?rev=22609&view=auto Modified: branches/double_rotor/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py?rev=22610&r1=22609&r2=22610&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=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/user_functions/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/frame_order.py?rev=22610&r1=22609&r2=22610&view=diff Modified: branches/double_rotor/user_functions/pipe.py URL: http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/pipe.py?rev=22610&r1=22609&r2=22610&view=diff