Author: bugman Date: Wed Oct 6 18:39:32 2010 New Revision: 11630 URL: http://svn.gna.org/viewcvs/relax?rev=11630&view=rev Log: Merged revisions 11552,11565,11567,11571-11572,11574,11587-11588,11591,11594,11597,11607,11609,11618,11627-11628 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r11552 | bugman | 2010-09-14 16:34:11 +0200 (Tue, 14 Sep 2010) | 3 lines Created a directory for relax graphics. The first files here are the relax logo and icons. ........ r11565 | bugman | 2010-09-15 19:36:15 +0200 (Wed, 15 Sep 2010) | 3 lines The Ref.cite_html() method can now handle missing data. ........ r11567 | bugman | 2010-09-15 19:43:22 +0200 (Wed, 15 Sep 2010) | 3 lines Ref.cite_html() no longer adds the DOI web address in front of normal web links! ........ r11571 | bugman | 2010-09-16 09:59:26 +0200 (Thu, 16 Sep 2010) | 3 lines Initialised the reference for the relax GUI paper. ........ r11572 | bugman | 2010-09-16 10:00:23 +0200 (Thu, 16 Sep 2010) | 3 lines Fix for the Bieri et al. ref. ........ r11574 | bugman | 2010-09-16 10:06:47 +0200 (Thu, 16 Sep 2010) | 3 lines Citations now include the status if not 'published'. ........ r11587 | bugman | 2010-09-16 18:20:20 +0200 (Thu, 16 Sep 2010) | 3 lines Renamed the results_folder arg to results_dir in the NOE auto-analysis, and rearranged the args. ........ r11588 | bugman | 2010-09-16 18:22:30 +0200 (Thu, 16 Sep 2010) | 5 lines Added a system test for the dauvergne_protocol auto-analysis code. The test is not yet functional. ........ r11591 | bugman | 2010-09-16 19:17:33 +0200 (Thu, 16 Sep 2010) | 6 lines Modified the specific code API to remove a number of references to spin_id. Some analysis types do not work on spins, so the spin_id args are being replaced by data_id to identify the data requested. For most methods, this will be the spin_id. ........ r11594 | bugman | 2010-09-17 10:06:20 +0200 (Fri, 17 Sep 2010) | 3 lines Shifted the debug and pedantic flags into the __main__ namespace for better access from other modules. ........ r11597 | bugman | 2010-09-17 10:30:22 +0200 (Fri, 17 Sep 2010) | 3 lines Some fixes for the NOE auto-analysis. ........ r11607 | bugman | 2010-09-17 15:57:10 +0200 (Fri, 17 Sep 2010) | 3 lines Fix for the NOE auto-analysis - the spins are now named to the value of the 'heteronuc' arg. ........ r11609 | bugman | 2010-09-17 18:02:20 +0200 (Fri, 17 Sep 2010) | 5 lines Shifted the NOE specific analysis code into its own package. This is in preparation for splitting up the module and adding new modules. ........ r11618 | bugman | 2010-09-29 15:26:50 +0200 (Wed, 29 Sep 2010) | 3 lines Added a catch for no data in the error analysis by replicated spectra. ........ r11627 | bugman | 2010-10-06 12:46:39 +0200 (Wed, 06 Oct 2010) | 3 lines Added some checks to the dauvergne_protocol mf analysis for the required previously optimised results. ........ r11628 | bugman | 2010-10-06 12:47:20 +0200 (Wed, 06 Oct 2010) | 3 lines pipe.delete() without args will now delete all data pipes. ........ Added: branches/bmrb/graphics/ - copied from r11628, 1.3/graphics/ branches/bmrb/specific_fns/noe/ - copied from r11628, 1.3/specific_fns/noe/ branches/bmrb/test_suite/shared_data/relaxation_data/13259_bug_reproducing_data/ - copied from r11628, 1.3/test_suite/shared_data/relaxation_data/13259_bug_reproducing_data/ branches/bmrb/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py - copied unchanged from r11628, 1.3/test_suite/system_tests/scripts/model_free/full_analysis_trunc.py Removed: branches/bmrb/specific_fns/noe.py Modified: branches/bmrb/ (props changed) branches/bmrb/auto_analyses/dauvergne_protocol.py branches/bmrb/auto_analyses/noe.py branches/bmrb/generic_fns/pipes.py branches/bmrb/generic_fns/spectrum.py branches/bmrb/info.py branches/bmrb/prompt/interpreter.py branches/bmrb/relax branches/bmrb/relax_errors.py branches/bmrb/relax_warnings.py branches/bmrb/specific_fns/api_base.py branches/bmrb/specific_fns/api_common.py branches/bmrb/specific_fns/consistency_tests.py branches/bmrb/specific_fns/frame_order.py branches/bmrb/specific_fns/jw_mapping.py branches/bmrb/specific_fns/model_free/main.py branches/bmrb/specific_fns/relax_fit.py branches/bmrb/test_suite/system_tests/model_free.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bmrb/auto_analyses/dauvergne_protocol.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/auto_analyses/dauvergne_protocol.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/auto_analyses/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/auto_analyses/noe.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/pipes.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/generic_fns/spectrum.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/spectrum.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/info.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/info.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/interpreter.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/relax URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/relax?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/relax_errors.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/relax_errors.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/relax_warnings.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/relax_warnings.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/api_base.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/api_base.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/api_common.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/api_common.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/consistency_tests.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/frame_order.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/jw_mapping.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/specific_fns/model_free/main.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/model_free/main.py?rev=11630&r1=11629&r2=11630&view=diff Removed: branches/bmrb/specific_fns/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/noe.py?rev=11629&view=auto Modified: branches/bmrb/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/relax_fit.py?rev=11630&r1=11629&r2=11630&view=diff Modified: branches/bmrb/test_suite/system_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/model_free.py?rev=11630&r1=11629&r2=11630&view=diff