Author: bugman Date: Mon Oct 20 20:45:43 2008 New Revision: 7852 URL: http://svn.gna.org/viewcvs/relax?rev=7852&view=rev Log: Merged revisions 7792-7851 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r7795 | bugman | 2008-10-17 00:18:03 +0200 (Fri, 17 Oct 2008) | 3 lines Added a class docstring for the main relax class. ........ r7796 | semor | 2008-10-17 00:29:26 +0200 (Fri, 17 Oct 2008) | 7 lines Corrected some naming and syntax within docstrings and prints. This follows a post by Edward at: https://mail.gna.org/public/relax-devel/2008-10/msg00068.html (message ID: 7f080ed10810161412j1910a956gd37dbd35eb0584c1@xxxxxxxxxxxxxx) ........ r7797 | semor | 2008-10-17 19:53:53 +0200 (Fri, 17 Oct 2008) | 7 lines Started the implementation of a generic peak intensities file. This follows a thread at: https://mail.gna.org/public/relax-devel/2008-10/msg00026.html (Message ID: 48EE7028.6060409@xxxxxxxxx) ........ r7798 | semor | 2008-10-17 20:01:24 +0200 (Fri, 17 Oct 2008) | 3 lines Started to write a system test for the support of the generic peak intensities file. ........ r7799 | semor | 2008-10-17 20:22:59 +0200 (Fri, 17 Oct 2008) | 11 lines Added prototypes for the generic peak intensities file. Only two files will be needed, instead of one file per delay. The first file (generic_delay.txt) will contain the different delays. The second file (generic_intensity.txt) will contain the peak intensities. There may also be a way of including all this information in one single file... maybe by putting the delays in the header ? This would be even simpler for the user who would only need to input 1 single file. ........ r7800 | semor | 2008-10-17 20:27:23 +0200 (Fri, 17 Oct 2008) | 6 lines Added a generic peak intensities file including the delay times. This is in response to r7799 (http://svn.gna.org/viewcvs/relax?rev=7799&view=rev) ........ r7801 | semor | 2008-10-17 21:23:57 +0200 (Fri, 17 Oct 2008) | 3 lines Added more to the system test for the generic peak intensities file. ........ r7802 | semor | 2008-10-17 21:34:13 +0200 (Fri, 17 Oct 2008) | 3 lines Ordered functions alphabetically. ........ r7803 | bugman | 2008-10-17 23:33:39 +0200 (Fri, 17 Oct 2008) | 5 lines Fixed the contents of the class docstring. This was incorrectly mentioning relaxation curve-fitting and was identified by Seb. ........ r7804 | semor | 2008-10-18 17:15:17 +0200 (Sat, 18 Oct 2008) | 11 lines Created a class named Peak_lists including the classes Generic, NMRView, Sparky and Xeasy. This solves a name clash pointed out in a post at: https://mail.gna.org/public/relax-devel/2008-10/msg00069.html (Message ID: 48F8E785.8090106@xxxxxxxxx) and was proposed by Edward in a post at: https://mail.gna.org/public/relax-devel/2008-10/msg00070.html (Message ID: 7f080ed10810171437s2103ba32pdf9f10d1ffe0230e@xxxxxxxxxxxxxx) ........ r7805 | semor | 2008-10-18 17:29:11 +0200 (Sat, 18 Oct 2008) | 3 lines Continued to add the support for the generic peak intensity file and ordered things alphabetically. ........ r7806 | semor | 2008-10-18 17:32:18 +0200 (Sat, 18 Oct 2008) | 3 lines Added a missing argument. ........ r7807 | semor | 2008-10-18 17:40:46 +0200 (Sat, 18 Oct 2008) | 3 lines Added missing arguments. ........ Added: branches/bmrb/test_suite/shared_data/peak_lists/generic.txt - copied unchanged from r7807, 1.3/test_suite/shared_data/peak_lists/generic.txt branches/bmrb/test_suite/shared_data/peak_lists/generic_delays.txt - copied unchanged from r7807, 1.3/test_suite/shared_data/peak_lists/generic_delays.txt branches/bmrb/test_suite/shared_data/peak_lists/generic_intensity.txt - copied unchanged from r7807, 1.3/test_suite/shared_data/peak_lists/generic_intensity.txt Modified: branches/bmrb/ (props changed) branches/bmrb/generic_fns/intensity.py branches/bmrb/prompt/noe.py branches/bmrb/prompt/relax_fit.py branches/bmrb/relax branches/bmrb/test_suite/system_tests/__init__.py branches/bmrb/test_suite/system_tests/generic.py branches/bmrb/test_suite/system_tests/peak_lists.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bmrb/generic_fns/intensity.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/intensity.py?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/prompt/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/noe.py?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/prompt/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/relax_fit.py?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/relax URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/relax?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/test_suite/system_tests/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/__init__.py?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/test_suite/system_tests/generic.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/generic.py?rev=7852&r1=7851&r2=7852&view=diff Modified: branches/bmrb/test_suite/system_tests/peak_lists.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/peak_lists.py?rev=7852&r1=7851&r2=7852&view=diff