r20079 - in /trunk: auto_analyses/ data_store/ docs/latex/ gui/analyses/ pipe_control/ sample_scripts/ sample_scripts/model_...r20079 - in /trunk: auto_analyses/ data_store/ docs/latex/ gui/analyses/ pipe_control/ sample_scripts/ sample_scripts/model_...Author: bugman Date: Thu Jun 13 10:11:02 2013 New Revision: 20079 URL: http://svn.gna.org/viewcvs/relax?rev=20079&view=rev Log: Merger of the dipole_pair and interatomic user function classes. The functionality of these two classes overlaps significantly. And the dipole_pair user functions are not related to magnetic dipole-dipole interactions. Therefore all the user functions from both classes were shifted into the new interatom user function. This change will affect almost all relax scripts but, as this will form part of the relax 3 release, script breakage should be expected anyway. Added: trunk/user_functions/interatom.py - copied, changed from r20078, trunk/user_functions/dipole_pair.py Removed: trunk/user_functions/dipole_pair.py trunk/user_functions/interatomic.py Modified: trunk/auto_analyses/stereochem_analysis.py trunk/data_store/__init__.py trunk/docs/latex/consistency_tests.tex trunk/docs/latex/data_model.tex trunk/docs/latex/intro.tex trunk/docs/latex/jw_mapping.tex trunk/docs/latex/model-free.tex trunk/gui/analyses/auto_model_free.py trunk/pipe_control/interatomic.py trunk/pipe_control/relax_data.py trunk/sample_scripts/angles.py trunk/sample_scripts/consistency_tests.py trunk/sample_scripts/jw_mapping.py trunk/sample_scripts/model_free/cv.py trunk/sample_scripts/model_free/dasha.py trunk/sample_scripts/model_free/dauvergne_protocol.py trunk/sample_scripts/model_free/diff_min.py trunk/sample_scripts/model_free/generate_ri.py trunk/sample_scripts/model_free/map.py trunk/sample_scripts/model_free/mf_multimodel.py trunk/sample_scripts/model_free/palmer.py trunk/sample_scripts/model_free/remap.py trunk/sample_scripts/model_free/single_model.py trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py trunk/sample_scripts/xh_vector_dist.py trunk/specific_analyses/model_free/results.py trunk/test_suite/gui_tests/model_free.py trunk/test_suite/shared_data/align_data/CaM/generate_data.py trunk/test_suite/shared_data/align_data/metal_pos_opt/generate.py trunk/test_suite/shared_data/align_data/missing_data/generate_missing.py trunk/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py trunk/test_suite/shared_data/align_data/paramagnetic/generate_data.py trunk/test_suite/shared_data/align_data/population_model/generate.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/full_analysis.py trunk/test_suite/shared_data/frame_order/cam/generate_base.py trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py trunk/test_suite/shared_data/frame_order/displacements/generate_data.py trunk/test_suite/shared_data/frame_order/displacements/optimisation.py trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py trunk/test_suite/shared_data/model_free/sphere/create_ri.py trunk/test_suite/system_tests/interatomic.py trunk/test_suite/system_tests/model_free.py trunk/test_suite/system_tests/scripts/angles.py trunk/test_suite/system_tests/scripts/bmrb_rw.py trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py trunk/test_suite/system_tests/scripts/bug_20674_jw_mapping.py trunk/test_suite/system_tests/scripts/consistency_tests.py trunk/test_suite/system_tests/scripts/consistency_tests_calc_test.py trunk/test_suite/system_tests/scripts/dasha.py trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py trunk/test_suite/system_tests/scripts/diff_tensor/tensor_opt.py trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py trunk/test_suite/system_tests/scripts/interatomic_tests.py trunk/test_suite/system_tests/scripts/jw_mapping.py trunk/test_suite/system_tests/scripts/jw_mapping_calc_test.py trunk/test_suite/system_tests/scripts/model_free/bug_15050.py trunk/test_suite/system_tests/scripts/model_free/bug_18790_negative_error.py trunk/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py trunk/test_suite/system_tests/scripts/model_free/bug_20683_bdc_inf_values.py trunk/test_suite/system_tests/scripts/model_free/bugs_12582_12591_12607.py trunk/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py trunk/test_suite/system_tests/scripts/model_free/generate_ri.py trunk/test_suite/system_tests/scripts/model_free/omp_model_free.py trunk/test_suite/system_tests/scripts/model_free/opendx_s2_te_rex.py trunk/test_suite/system_tests/scripts/model_free/opt_setup_S2_0_970_te_2048_Rex_0_149.py trunk/test_suite/system_tests/scripts/model_free/opt_setup_local_tm_10_S2_0_8_te_40.py trunk/test_suite/system_tests/scripts/model_free/opt_tm_fns.py trunk/test_suite/system_tests/scripts/model_free/tylers_peptide.py trunk/test_suite/system_tests/scripts/n_state_model/absolute_rdcs.py trunk/test_suite/system_tests/scripts/n_state_model/absolute_rdcs_menthol.py trunk/test_suite/system_tests/scripts/n_state_model/align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/data_copying.py trunk/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py trunk/test_suite/system_tests/scripts/n_state_model/missing_data_test.py trunk/test_suite/system_tests/scripts/n_state_model/monte_carlo_testing.py trunk/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py trunk/test_suite/system_tests/scripts/n_state_model/paramag_centre_fit.py trunk/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py trunk/test_suite/system_tests/scripts/n_state_model/populations.py trunk/test_suite/system_tests/scripts/n_state_model/rdc_tensor.py trunk/test_suite/system_tests/scripts/n_state_model/vector_loading.py trunk/test_suite/system_tests/scripts/palmer.py trunk/test_suite/system_tests/scripts/palmer_omp.py trunk/test_suite/system_tests/scripts/xh_vector_dist.py trunk/test_suite/system_tests/structure.py trunk/test_suite/system_tests/unit_vectors.py trunk/user_functions/__init__.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/auto_analyses/stereochem_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/stereochem_analysis.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/data_store/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/docs/latex/consistency_tests.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/consistency_tests.tex?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/docs/latex/data_model.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/data_model.tex?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/docs/latex/intro.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/intro.tex?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/docs/latex/jw_mapping.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/jw_mapping.tex?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/docs/latex/model-free.tex URL: http://svn.gna.org/viewcvs/relax/trunk/docs/latex/model-free.tex?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/pipe_control/interatomic.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/interatomic.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/pipe_control/relax_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/relax_data.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/angles.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/angles.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/consistency_tests.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/jw_mapping.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/cv.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/cv.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/dasha.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/dasha.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/dauvergne_protocol.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/diff_min.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/diff_min.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/generate_ri.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/generate_ri.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/map.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/map.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/mf_multimodel.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/mf_multimodel.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/palmer.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/palmer.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/remap.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/remap.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/model_free/single_model.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/single_model.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/sample_scripts/xh_vector_dist.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/xh_vector_dist.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/specific_analyses/model_free/results.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/results.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/model_free.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/CaM/generate_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/CaM/generate_data.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/metal_pos_opt/generate.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/metal_pos_opt/generate.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/missing_data/generate_missing.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/missing_data/generate_missing.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/monte_carlo_testing/generate_data.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/paramagnetic/generate_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/paramagnetic/generate_data.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/align_data/population_model/generate.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/align_data/population_model/generate.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/generate_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/generate_base.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py?rev=20079&r1=20078&r2=20079&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py [... 209 lines stripped ...]