Author: bugman
Date: Tue Oct 21 15:28:17 2008
New Revision: 7880
URL: http://svn.gna.org/viewcvs/relax?rev=7880&view=rev
Log:
Merged revisions 7795-7807,7866-7873,7876-7878 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.
........
r7866 | bugman | 2008-10-20 22:11:40 +0200 (Mon, 20 Oct 2008) | 7 lines
Bug fix for the LaTeX table generating script.
This was identified by Tyler Reddy "TREDDY at dal dot ca" in the message at
https://mail.gna.org/public/relax-users/2008-10/msg00062.html (Message-id:
<20081020162741.yimh96r4oq2ow4w0@xxxxxxxxxx>).
........
r7867 | bugman | 2008-10-20 22:28:02 +0200 (Mon, 20 Oct 2008) | 3 lines
Duplicated the latex_mf_table.py sample script for the creation of a system
test.
........
r7868 | bugman | 2008-10-20 22:45:41 +0200 (Mon, 20 Oct 2008) | 3 lines
Comment fix in the latex_mf_table.py sample script.
........
r7869 | bugman | 2008-10-20 22:46:37 +0200 (Mon, 20 Oct 2008) | 3 lines
Modified the latex_mf_table.py script for the test suite.
........
r7870 | bugman | 2008-10-20 22:51:27 +0200 (Mon, 20 Oct 2008) | 3 lines
Activated the model-free results to LaTeX table sample script.
........
r7871 | bugman | 2008-10-20 22:51:57 +0200 (Mon, 20 Oct 2008) | 3 lines
Missing import.
........
r7872 | bugman | 2008-10-20 22:59:45 +0200 (Mon, 20 Oct 2008) | 3 lines
Fix for the test_latex_table() system test.
........
r7873 | bugman | 2008-10-20 23:00:14 +0200 (Mon, 20 Oct 2008) | 3 lines
Fix for the latex_mf_table.py sample script. This matches the system test
fix in r7872.
........
r7876 | bugman | 2008-10-21 11:50:12 +0200 (Tue, 21 Oct 2008) | 11 lines
Fixes for the model-free LaTeX table generation sample script.
These fixes do not affect the system test result yet - as LaTeX compilation
will not be part of the
test suite - but fix the LaTeX compilation. These will be ported back to
the sample script.
The docstring has been modified as the booktabs package is needed for this
table. The '&'
characters in the spin_id string have been escaped to avoid this being
interpreted as a column
separator. The 'Residue' column has been renamed to 'Spin'. And finally
missing model-free
parameter errors can be handled.
........
r7877 | bugman | 2008-10-21 11:53:58 +0200 (Tue, 21 Oct 2008) | 24 lines
Ported the changes of r7876 from the test suite to the sample script.
The command used was:
svn merge -r7875:7876 test_suite/system_tests/scripts/latex_mf_table.py
sample_scripts/latex_mf_table.py
The LaTeX document starting and ending commands have been removed from this
revision!
.....
r7876 | bugman | 2008-10-21 11:50:12 +0200 (Tue, 21 Oct 2008) | 11 lines
Changed paths:
M /1.3/test_suite/system_tests/scripts/latex_mf_table.py
Fixes for the model-free LaTeX table generation sample script.
These fixes do not affect the system test result yet - as LaTeX
compilation will not be part of the
test suite - but fix the LaTeX compilation. These will be ported back to
the sample script.
The docstring has been modified as the booktabs package is needed for
this table. The '&'
characters in the spin_id string have been escaped to avoid this being
interpreted as a column
separator. The 'Residue' column has been renamed to 'Spin'. And finally
missing model-free
parameter errors can be handled.
.....
........
r7878 | bugman | 2008-10-21 15:17:17 +0200 (Tue, 21 Oct 2008) | 3 lines
Fixes for all the standard deviation and variance variable names.
........
Added:
branches/spectral_errors/test_suite/shared_data/peak_lists/generic.txt
- copied unchanged from r7878,
1.3/test_suite/shared_data/peak_lists/generic.txt
branches/spectral_errors/test_suite/shared_data/peak_lists/generic_delays.txt
- copied unchanged from r7878,
1.3/test_suite/shared_data/peak_lists/generic_delays.txt
branches/spectral_errors/test_suite/shared_data/peak_lists/generic_intensity.txt
- copied unchanged from r7878,
1.3/test_suite/shared_data/peak_lists/generic_intensity.txt
branches/spectral_errors/test_suite/system_tests/scripts/latex_mf_table.py
- copied unchanged from r7878,
1.3/test_suite/system_tests/scripts/latex_mf_table.py
Modified:
branches/spectral_errors/ (props changed)
branches/spectral_errors/generic_fns/intensity.py
branches/spectral_errors/prompt/noe.py
branches/spectral_errors/prompt/relax_fit.py
branches/spectral_errors/relax
branches/spectral_errors/sample_scripts/latex_mf_table.py
branches/spectral_errors/specific_fns/relax_fit.py
branches/spectral_errors/test_suite/system_tests/__init__.py
branches/spectral_errors/test_suite/system_tests/generic.py
branches/spectral_errors/test_suite/system_tests/model_free.py
branches/spectral_errors/test_suite/system_tests/peak_lists.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/spectral_errors/generic_fns/intensity.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/generic_fns/intensity.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/prompt/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/prompt/noe.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/prompt/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/prompt/relax_fit.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/relax?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/sample_scripts/latex_mf_table.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/sample_scripts/latex_mf_table.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/specific_fns/relax_fit.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/test_suite/system_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/system_tests/__init__.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/test_suite/system_tests/generic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/system_tests/generic.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/system_tests/model_free.py?rev=7880&r1=7879&r2=7880&view=diff
Modified: branches/spectral_errors/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/system_tests/peak_lists.py?rev=7880&r1=7879&r2=7880&view=diff
r7880 - in /branches/spectral_errors: ./ generic_fns/ prompt/ sample_scripts/ specific_fns/ test_suite/shared_data/peak_list...