Author: bugman
Date: Tue Sep 23 10:51:04 2014
New Revision: 25966
URL: http://svn.gna.org/viewcvs/relax?rev=25966&view=rev
Log:
Merged revisions 25965 via svnmerge from
svn+ssh://[email protected]/svn/relax/trunk
........
r25965 | bugman | 2014-09-23 10:49:12 +0200 (Tue, 23 Sep 2014) | 8 lines
Shifted the specific_analyses.relax_disp.variables module into lib.dispersion.
This is both to minimise circular dependencies, as previously the
specific_analyses.relax_disp
modules import from target_functions.relax_disp and vice-versa, and to allow
the relax library
functions to have access to these variables. This follows from a similar
change to the frame order
analysis in the frame_order_cleanup branch.
........
Added:
branches/frame_order_cleanup/lib/dispersion/variables.py
- copied unchanged from r25965, trunk/lib/dispersion/variables.py
Removed:
branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/auto_analyses/relax_disp.py
branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py
branches/frame_order_cleanup/gui/analyses/auto_relax_disp.py
branches/frame_order_cleanup/lib/dispersion/__init__.py
branches/frame_order_cleanup/specific_analyses/relax_disp/__init__.py
branches/frame_order_cleanup/specific_analyses/relax_disp/api.py
branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py
branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py
branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
branches/frame_order_cleanup/specific_analyses/relax_disp/estimate_r2eff.py
branches/frame_order_cleanup/specific_analyses/relax_disp/model.py
branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
branches/frame_order_cleanup/specific_analyses/relax_disp/parameter_object.py
branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py
branches/frame_order_cleanup/target_functions/relax_disp.py
branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py
branches/frame_order_cleanup/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_ns_r1rho_2site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_tp02.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/2_pre_run_r2eff.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site/relax_results/solution.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site_linear/relax_results/solution.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/base.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14_full.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_cr72_full.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_it99.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_lm63.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_lm63_3site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_m61.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_mmq_cr72.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_mp05.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_norex.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D_full.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_star.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_star_full.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_mmq_2site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_mmq_3site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_mmq_3site_linear.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_r1rho_2site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_r1rho_3site.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_ns_r1rho_3site_linear.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_tap03.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_tp02.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py
branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/ns_mmq_3site_linear.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/ns_r1rho_3site.py
branches/frame_order_cleanup/test_suite/system_tests/scripts/relax_disp/ns_r1rho_3site_linear.py
branches/frame_order_cleanup/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
branches/frame_order_cleanup/test_suite/unit_tests/_specific_analyses/_relax_disp/test_variables.py
branches/frame_order_cleanup/user_functions/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_cleanup/auto_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/gui/analyses/auto_relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/analyses/auto_relax_disp.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/lib/dispersion/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/dispersion/__init__.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/__init__.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/api.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/catia.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/checks.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/data.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/estimate_r2eff.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/estimate_r2eff.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/model.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/parameter_object.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/parameter_object.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/parameters.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/uf.py?rev=25966&r1=25965&r2=25966&view=diff
Removed: branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/variables.py?rev=25965&view=auto
Modified: branches/frame_order_cleanup/target_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/relax_disp.py?rev=25966&r1=25965&r2=25966&view=diff
Modified: branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_ns_r1rho_2site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_ns_r1rho_2site.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_tp02.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Fyn_SH3_R1rho/relax_results/solution_tp02.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/2_pre_run_r2eff.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/2_pre_run_r2eff.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/15N_SQ_CPMG/optimise.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/1H_SQ_CPMG/optimise.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/DQ_CPMG/optimise.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/ZQ_CPMG/optimise.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/cpmg_fit_solution_cr72.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/optimise_sq.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/Korzhnev_et_al_2005/relax_results/relax_state_sq.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site/relax_results/solution.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_mmq_3site_linear/relax_results/solution.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site/relax_results/solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site/relax_results/solution.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site_linear/relax_results/solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/ns_r1rho_3site_linear/relax_results/solution.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/print_model_info/print_model_info.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/base.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14_full.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_b14_full.py?rev=25966&r1=25965&r2=25966&view=diff
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/profiling_cr72.py?rev=25966&r1=25965&r2=25966&view=diff
[... 99 lines stripped ...]
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
