Author: michaelbieri Date: Mon Mar 29 00:57:13 2010 New Revision: 11051 URL: http://svn.gna.org/viewcvs/relax?rev=11051&view=rev Log: 1.3 branch was merged into bieri_gui branch to update recent improvements. - Diese und die folgenden Zeilen werden ignoriert -- _M . M prompt/deselect.py M prompt/frq.py M prompt/jw_mapping.py M prompt/pipe.py M prompt/__init__.py M prompt/base_class.py M prompt/minimisation.py M prompt/residue.py M prompt/structure.py M prompt/spectrum.py M prompt/relax_data.py M prompt/model_selection.py M prompt/sequence.py M prompt/spin.py M prompt/view.py M prompt/value.py M prompt/relax_fit.py M prompt/select.py M prompt/palmer.py M prompt/dasha.py M prompt/diffusion_tensor.py M prompt/state.py M prompt/align_tensor.py M prompt/fix.py M prompt/vmd.py M prompt/temperature.py M prompt/molmol.py M prompt/pymol_control.py M prompt/model_free.py M prompt/results.py M prompt/monte_carlo.py M prompt/interpreter.py M prompt/molecule.py M prompt/eliminate.py M prompt/rdc.py M prompt/angles.py M prompt/dx.py M prompt/n_state_model.py M prompt/noe.py M prompt/grace.py M prompt/consistency_tests.py M prompt/pcs.py M prompt/frame_order.py M generic_fns/__init__.py M generic_fns/structure/internal.py M generic_fns/structure/geometric.py M generic_fns/diffusion_tensor.py M generic_fns/pymol_control.py M docs/latex/fetch_docstrings.py A + test_suite/shared_data/diffusion_tensor A + test_suite/shared_data/diffusion_tensor/ellipsoid A + test_suite/shared_data/diffusion_tensor/ellipsoid/R2.800.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/uniform.pdb A + test_suite/shared_data/diffusion_tensor/ellipsoid/NOE.500.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/generate_data.py A + test_suite/shared_data/diffusion_tensor/ellipsoid/NOE.600.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R1.500.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/NOE.700.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R1.600.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R2.500.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/NOE.800.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R1.700.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R2.600.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R1.800.out A + test_suite/shared_data/diffusion_tensor/ellipsoid/R2.700.out A + test_suite/shared_data/diffusion_tensor/__init__.py A + test_suite/shared_data/diffusion_tensor/sphere A + test_suite/shared_data/diffusion_tensor/sphere/R2.800.out A + test_suite/shared_data/diffusion_tensor/sphere/uniform.pdb A + test_suite/shared_data/diffusion_tensor/sphere/NOE.500.out A + test_suite/shared_data/diffusion_tensor/sphere/generate_data.py A + test_suite/shared_data/diffusion_tensor/sphere/NOE.600.out A + test_suite/shared_data/diffusion_tensor/sphere/R1.500.out A + test_suite/shared_data/diffusion_tensor/sphere/NOE.700.out A + test_suite/shared_data/diffusion_tensor/sphere/R1.600.out A + test_suite/shared_data/diffusion_tensor/sphere/R2.500.out A + test_suite/shared_data/diffusion_tensor/sphere/NOE.800.out A + test_suite/shared_data/diffusion_tensor/sphere/R1.700.out A + test_suite/shared_data/diffusion_tensor/sphere/R2.600.out A + test_suite/shared_data/diffusion_tensor/sphere/R1.800.out A + test_suite/shared_data/diffusion_tensor/sphere/R2.700.out A + test_suite/shared_data/diffusion_tensor/generate_data.py A + test_suite/shared_data/diffusion_tensor/spheroid A + test_suite/shared_data/diffusion_tensor/spheroid/R2.800.out A + test_suite/shared_data/diffusion_tensor/spheroid/uniform.pdb A + test_suite/shared_data/diffusion_tensor/spheroid/NOE.500.out A + test_suite/shared_data/diffusion_tensor/spheroid/generate_data.py A + test_suite/shared_data/diffusion_tensor/spheroid/NOE.600.out A + test_suite/shared_data/diffusion_tensor/spheroid/R1.500.out A + test_suite/shared_data/diffusion_tensor/spheroid/NOE.700.out A + test_suite/shared_data/diffusion_tensor/spheroid/R1.600.out A + test_suite/shared_data/diffusion_tensor/spheroid/R2.500.out A + test_suite/shared_data/diffusion_tensor/spheroid/NOE.800.out A + test_suite/shared_data/diffusion_tensor/spheroid/R1.700.out A + test_suite/shared_data/diffusion_tensor/spheroid/R2.600.out A + test_suite/shared_data/diffusion_tensor/spheroid/R1.800.out A + test_suite/shared_data/diffusion_tensor/spheroid/R2.700.out M test_suite/shared_data/align_data/CaM/generate_data.py M test_suite/shared_data/align_data/CaM/pre_bleach.py M test_suite/shared_data/structures/diff_tensors/spheroid.pdb M test_suite/shared_data/structures/diff_tensors/ellipsoid.pdb M test_suite/shared_data/structures/diff_tensors/sphere.pdb M test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py A + test_suite/shared_data/__init__.py M test_suite/unit_tests/_prompt/test_pymol.py M test_suite/unit_tests/_generic_fns/_structure/test_internal.py M test_suite/unit_tests/_generic_fns/_structure/test_scientific.py M test_suite/unit_tests/relax_data_testing_base.py M test_suite/unit_tests/sequence_testing_base.py M test_suite/unit_tests/_specific_fns/_model_free/test_main.py M test_suite/unit_tests/state_testing_base.py M test_suite/unit_tests/unit_test_runner.py M test_suite/system_tests/model_elimination.py M test_suite/system_tests/load_spins.py M test_suite/system_tests/jw_mapping.py M test_suite/system_tests/peak_lists.py M test_suite/system_tests/noe_restraints.py M test_suite/system_tests/scripts/palmer_omp.py M test_suite/system_tests/scripts/jw_mapping.py M test_suite/system_tests/scripts/load_spins_from_small_molecule.py M test_suite/system_tests/scripts/tylers_peptide.py M test_suite/system_tests/scripts/bug_14872_unicode_selection.py M test_suite/system_tests/scripts/frame_order/opt_rigid_rand_rot.py M test_suite/system_tests/scripts/bugs_12582_12591_12607.py M test_suite/system_tests/scripts/local_tm_model_elimination.py M test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py M test_suite/system_tests/scripts/create_m4.py M test_suite/system_tests/scripts/1UBQ_relax_fit.py M test_suite/system_tests/scripts/latex_mf_table.py M test_suite/system_tests/scripts/opendx_s2_te_rex.py M test_suite/system_tests/scripts/angles.py M test_suite/system_tests/scripts/model_free/bug_14941_local_tm_global_selection.py M test_suite/system_tests/scripts/model_free/bug_15050.py A + test_suite/system_tests/scripts/diff_tensor A + test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py A + test_suite/system_tests/scripts/diff_tensor/tensor_opt.py M test_suite/system_tests/scripts/omp_model_free.py M test_suite/system_tests/scripts/relax_fit.py M test_suite/system_tests/scripts/dasha.py M test_suite/system_tests/scripts/palmer.py M test_suite/system_tests/scripts/noe.py M test_suite/system_tests/scripts/consistency_tests.py M test_suite/system_tests/scripts/generate_ri.py M test_suite/system_tests/scripts/xh_vector_dist.py M test_suite/system_tests/scripts/n_state_model/align_fit.py M test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py M test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py M test_suite/system_tests/scripts/n_state_model/lactose_n_state.py M test_suite/system_tests/structure.py M test_suite/system_tests/model_free.py M test_suite/system_tests/results.py M test_suite/system_tests/model_selection.py M test_suite/system_tests/sequence.py M test_suite/system_tests/angles.py M test_suite/system_tests/generic.py M test_suite/system_tests/n_state_model.py M test_suite/system_tests/relax_fit.py M test_suite/system_tests/diffusion_tensor.py M test_suite/system_tests/dasha.py M test_suite/system_tests/palmer.py M test_suite/system_tests/noe.py M test_suite/system_tests/consistency_tests.py M test_suite/system_tests/unit_vectors.py M test_suite/system_tests/frame_order.py M test_suite/test_suite_runner.py M auto_analyses/__init__.py M auto_analyses/dauvergne_protocol.py A + auto_analyses/noe.py M relax Added: branches/bieri_gui/auto_analyses/noe.py - copied unchanged from r11050, 1.3/auto_analyses/noe.py branches/bieri_gui/test_suite/shared_data/__init__.py - copied unchanged from r11050, 1.3/test_suite/shared_data/__init__.py branches/bieri_gui/test_suite/shared_data/diffusion_tensor/ - copied from r11050, 1.3/test_suite/shared_data/diffusion_tensor/ branches/bieri_gui/test_suite/system_tests/scripts/diff_tensor/ - copied from r11050, 1.3/test_suite/system_tests/scripts/diff_tensor/ Modified: branches/bieri_gui/ (props changed) branches/bieri_gui/auto_analyses/__init__.py branches/bieri_gui/auto_analyses/dauvergne_protocol.py branches/bieri_gui/docs/latex/fetch_docstrings.py branches/bieri_gui/generic_fns/__init__.py branches/bieri_gui/generic_fns/diffusion_tensor.py branches/bieri_gui/generic_fns/pymol_control.py branches/bieri_gui/generic_fns/structure/geometric.py branches/bieri_gui/generic_fns/structure/internal.py branches/bieri_gui/prompt/__init__.py branches/bieri_gui/prompt/align_tensor.py branches/bieri_gui/prompt/angles.py branches/bieri_gui/prompt/base_class.py branches/bieri_gui/prompt/consistency_tests.py branches/bieri_gui/prompt/dasha.py branches/bieri_gui/prompt/deselect.py branches/bieri_gui/prompt/diffusion_tensor.py branches/bieri_gui/prompt/dx.py branches/bieri_gui/prompt/eliminate.py branches/bieri_gui/prompt/fix.py branches/bieri_gui/prompt/frame_order.py branches/bieri_gui/prompt/frq.py branches/bieri_gui/prompt/grace.py branches/bieri_gui/prompt/interpreter.py branches/bieri_gui/prompt/jw_mapping.py branches/bieri_gui/prompt/minimisation.py branches/bieri_gui/prompt/model_free.py branches/bieri_gui/prompt/model_selection.py branches/bieri_gui/prompt/molecule.py branches/bieri_gui/prompt/molmol.py branches/bieri_gui/prompt/monte_carlo.py branches/bieri_gui/prompt/n_state_model.py branches/bieri_gui/prompt/noe.py branches/bieri_gui/prompt/palmer.py branches/bieri_gui/prompt/pcs.py branches/bieri_gui/prompt/pipe.py branches/bieri_gui/prompt/pymol_control.py branches/bieri_gui/prompt/rdc.py branches/bieri_gui/prompt/relax_data.py branches/bieri_gui/prompt/relax_fit.py branches/bieri_gui/prompt/residue.py branches/bieri_gui/prompt/results.py branches/bieri_gui/prompt/select.py branches/bieri_gui/prompt/sequence.py branches/bieri_gui/prompt/spectrum.py branches/bieri_gui/prompt/spin.py branches/bieri_gui/prompt/state.py branches/bieri_gui/prompt/structure.py branches/bieri_gui/prompt/temperature.py branches/bieri_gui/prompt/value.py branches/bieri_gui/prompt/view.py branches/bieri_gui/prompt/vmd.py branches/bieri_gui/relax branches/bieri_gui/test_suite/shared_data/align_data/CaM/generate_data.py branches/bieri_gui/test_suite/shared_data/align_data/CaM/pre_bleach.py branches/bieri_gui/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py branches/bieri_gui/test_suite/shared_data/structures/diff_tensors/ellipsoid.pdb branches/bieri_gui/test_suite/shared_data/structures/diff_tensors/sphere.pdb branches/bieri_gui/test_suite/shared_data/structures/diff_tensors/spheroid.pdb branches/bieri_gui/test_suite/system_tests/angles.py branches/bieri_gui/test_suite/system_tests/consistency_tests.py branches/bieri_gui/test_suite/system_tests/dasha.py branches/bieri_gui/test_suite/system_tests/diffusion_tensor.py branches/bieri_gui/test_suite/system_tests/frame_order.py branches/bieri_gui/test_suite/system_tests/generic.py branches/bieri_gui/test_suite/system_tests/jw_mapping.py branches/bieri_gui/test_suite/system_tests/load_spins.py branches/bieri_gui/test_suite/system_tests/model_elimination.py branches/bieri_gui/test_suite/system_tests/model_free.py branches/bieri_gui/test_suite/system_tests/model_selection.py branches/bieri_gui/test_suite/system_tests/n_state_model.py branches/bieri_gui/test_suite/system_tests/noe.py branches/bieri_gui/test_suite/system_tests/noe_restraints.py branches/bieri_gui/test_suite/system_tests/palmer.py branches/bieri_gui/test_suite/system_tests/peak_lists.py branches/bieri_gui/test_suite/system_tests/relax_fit.py branches/bieri_gui/test_suite/system_tests/results.py branches/bieri_gui/test_suite/system_tests/scripts/1UBQ_relax_fit.py branches/bieri_gui/test_suite/system_tests/scripts/angles.py branches/bieri_gui/test_suite/system_tests/scripts/bug_14872_unicode_selection.py branches/bieri_gui/test_suite/system_tests/scripts/bugs_12582_12591_12607.py branches/bieri_gui/test_suite/system_tests/scripts/consistency_tests.py branches/bieri_gui/test_suite/system_tests/scripts/create_m4.py branches/bieri_gui/test_suite/system_tests/scripts/dasha.py branches/bieri_gui/test_suite/system_tests/scripts/frame_order/opt_rigid_rand_rot.py branches/bieri_gui/test_suite/system_tests/scripts/generate_ri.py branches/bieri_gui/test_suite/system_tests/scripts/jw_mapping.py branches/bieri_gui/test_suite/system_tests/scripts/latex_mf_table.py branches/bieri_gui/test_suite/system_tests/scripts/load_spins_from_small_molecule.py branches/bieri_gui/test_suite/system_tests/scripts/local_tm_model_elimination.py branches/bieri_gui/test_suite/system_tests/scripts/model_free/bug_14941_local_tm_global_selection.py branches/bieri_gui/test_suite/system_tests/scripts/model_free/bug_15050.py branches/bieri_gui/test_suite/system_tests/scripts/n_state_model/align_fit.py branches/bieri_gui/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py branches/bieri_gui/test_suite/system_tests/scripts/n_state_model/phthalic_acid_noes.py branches/bieri_gui/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py branches/bieri_gui/test_suite/system_tests/scripts/noe.py branches/bieri_gui/test_suite/system_tests/scripts/omp_model_free.py branches/bieri_gui/test_suite/system_tests/scripts/opendx_s2_te_rex.py branches/bieri_gui/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py branches/bieri_gui/test_suite/system_tests/scripts/palmer.py branches/bieri_gui/test_suite/system_tests/scripts/palmer_omp.py branches/bieri_gui/test_suite/system_tests/scripts/relax_fit.py branches/bieri_gui/test_suite/system_tests/scripts/tylers_peptide.py branches/bieri_gui/test_suite/system_tests/scripts/xh_vector_dist.py branches/bieri_gui/test_suite/system_tests/sequence.py branches/bieri_gui/test_suite/system_tests/structure.py branches/bieri_gui/test_suite/system_tests/unit_vectors.py branches/bieri_gui/test_suite/test_suite_runner.py branches/bieri_gui/test_suite/unit_tests/_generic_fns/_structure/test_internal.py branches/bieri_gui/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py branches/bieri_gui/test_suite/unit_tests/_prompt/test_pymol.py branches/bieri_gui/test_suite/unit_tests/_specific_fns/_model_free/test_main.py branches/bieri_gui/test_suite/unit_tests/relax_data_testing_base.py branches/bieri_gui/test_suite/unit_tests/sequence_testing_base.py branches/bieri_gui/test_suite/unit_tests/state_testing_base.py branches/bieri_gui/test_suite/unit_tests/unit_test_runner.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bieri_gui/auto_analyses/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/__init__.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/docs/latex/fetch_docstrings.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/docs/latex/fetch_docstrings.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/generic_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/__init__.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/diffusion_tensor.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/generic_fns/pymol_control.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/pymol_control.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/generic_fns/structure/geometric.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/structure/geometric.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/structure/internal.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/__init__.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/align_tensor.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/angles.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/angles.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/base_class.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/base_class.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/consistency_tests.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/dasha.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/dasha.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/deselect.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/deselect.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/diffusion_tensor.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/dx.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/dx.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/eliminate.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/eliminate.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/fix.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/fix.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/frame_order.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/frq.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/frq.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/grace.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/interpreter.py?rev=11051&r1=11050&r2=11051&view=diff Modified: branches/bieri_gui/prompt/jw_mapping.py [... 278 lines stripped ...]