r3074 - in /1.3: ./ data/ dx/ generic_fns/ maths_fns/ prompt/ sample_scripts/ specific_fns/ test_suite/system_tests/ test_su...r3074 - in /1.3: ./ data/ dx/ generic_fns/ maths_fns/ prompt/ sample_scripts/ specific_fns/ test_suite/system_tests/ test_su...Author: bugman Date: Sun Mar 4 09:12:48 2007 New Revision: 3074 URL: http://svn.gna.org/viewcvs/relax?rev=3074&view=rev Log: Merging of the 'error_import' branch. The command used was: svn merge -r3035:3073 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/error_import These changes include the ideas which were discussed in the thread starting at https://mail.gna.org/public/relax-devel/2007-02/msg00003.html (Message-id: <45DACFEA.7020108@xxxxxxxxxxxxxxx>). The full details are given in the post located at https://mail.gna.org/public/relax-devel/2007-03/msg00000.html (Message-id: <7f080ed10703012125m7e6dff3du21e49d888cad2c02@xxxxxxxxxxxxxx>). Two major changes have occurred - the removal of the usage of the __builtin__ module for storage of 'global' variables; and a slight redesign of the RelaxError and RelaxWarning systems. If you would like to use a RelaxError or RelaxWarning, the corresponding class must now be imported. Added: 1.3/relax_errors.py - copied unchanged from r3073, branches/error_import/relax_errors.py 1.3/relax_warnings.py - copied unchanged from r3073, branches/error_import/relax_warnings.py Removed: 1.3/errors.py Modified: 1.3/colour.py 1.3/data/diff_tensor.py 1.3/dx/base_map.py 1.3/dx/opendx.py 1.3/generic_fns/angles.py 1.3/generic_fns/dasha.py 1.3/generic_fns/diffusion_tensor.py 1.3/generic_fns/eliminate.py 1.3/generic_fns/fix.py 1.3/generic_fns/grace.py 1.3/generic_fns/intensity.py 1.3/generic_fns/minimise.py 1.3/generic_fns/model_selection.py 1.3/generic_fns/molmol.py 1.3/generic_fns/monte_carlo.py 1.3/generic_fns/nuclei.py 1.3/generic_fns/palmer.py 1.3/generic_fns/pymol.py 1.3/generic_fns/results.py 1.3/generic_fns/runs.py 1.3/generic_fns/selection.py 1.3/generic_fns/sequence.py 1.3/generic_fns/structure.py 1.3/generic_fns/value.py 1.3/generic_fns/vmd.py 1.3/io.py 1.3/maths_fns/mf.py 1.3/prompt/angles.py 1.3/prompt/command.py 1.3/prompt/dasha.py 1.3/prompt/diffusion_tensor.py 1.3/prompt/dx.py 1.3/prompt/eliminate.py 1.3/prompt/fix.py 1.3/prompt/grace.py 1.3/prompt/interpreter.py 1.3/prompt/jw_mapping.py 1.3/prompt/minimisation.py 1.3/prompt/model_free.py 1.3/prompt/model_selection.py 1.3/prompt/molmol.py 1.3/prompt/monte_carlo.py 1.3/prompt/noe.py 1.3/prompt/nuclei.py 1.3/prompt/palmer.py 1.3/prompt/pymol.py 1.3/prompt/relax_data.py 1.3/prompt/relax_fit.py 1.3/prompt/results.py 1.3/prompt/run.py 1.3/prompt/select.py 1.3/prompt/sequence.py 1.3/prompt/state.py 1.3/prompt/structure.py 1.3/prompt/tab_completion.py 1.3/prompt/thread.py 1.3/prompt/unselect.py 1.3/prompt/value.py 1.3/prompt/vmd.py 1.3/relax 1.3/sample_scripts/full_analysis.py 1.3/sample_scripts/palmer.py 1.3/specific_fns/base_class.py 1.3/specific_fns/hybrid.py 1.3/specific_fns/jw_mapping.py 1.3/specific_fns/model_free.py 1.3/specific_fns/noe.py 1.3/specific_fns/relax_data.py 1.3/specific_fns/relax_fit.py 1.3/specific_fns/specific_setup.py 1.3/test_suite/system_tests/main.py 1.3/test_suite/unit_tests/data/test_diff_tensor.py 1.3/thread_classes.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/colour.py URL: http://svn.gna.org/viewcvs/relax/1.3/colour.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/data/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/diff_tensor.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/dx/base_map.py URL: http://svn.gna.org/viewcvs/relax/1.3/dx/base_map.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/dx/opendx.py URL: http://svn.gna.org/viewcvs/relax/1.3/dx/opendx.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/angles.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/eliminate.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/eliminate.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/fix.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/fix.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/intensity.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/minimise.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/model_selection.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/molmol.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/monte_carlo.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/nuclei.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/nuclei.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pymol.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/results.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/runs.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/runs.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/generic_fns/vmd.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/vmd.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/io.py URL: http://svn.gna.org/viewcvs/relax/1.3/io.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/maths_fns/mf.py URL: http://svn.gna.org/viewcvs/relax/1.3/maths_fns/mf.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/angles.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/angles.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/command.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/command.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dasha.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/diffusion_tensor.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/dx.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/dx.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/eliminate.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/eliminate.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/fix.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/fix.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/grace.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/jw_mapping.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/minimisation.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/minimisation.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_free.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/model_selection.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/model_selection.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/molmol.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/monte_carlo.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/noe.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/noe.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/nuclei.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/nuclei.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/palmer.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/pymol.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/pymol.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_data.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_fit.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/results.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/run.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/run.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/select.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/select.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/sequence.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/state.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/state.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/structure.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/tab_completion.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/tab_completion.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/thread.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/thread.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/unselect.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/unselect.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/value.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/value.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/prompt/vmd.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/vmd.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/relax URL: http://svn.gna.org/viewcvs/relax/1.3/relax?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/sample_scripts/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/full_analysis.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/sample_scripts/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/palmer.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/base_class.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/hybrid.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/noe.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/specific_fns/specific_setup.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/specific_setup.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/test_suite/system_tests/main.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/main.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/test_suite/unit_tests/data/test_diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/data/test_diff_tensor.py?rev=3074&r1=3073&r2=3074&view=diff Modified: 1.3/thread_classes.py URL: http://svn.gna.org/viewcvs/relax/1.3/thread_classes.py?rev=3074&r1=3073&r2=3074&view=diff