Author: bugman
Date: Thu Oct 16 23:54:42 2008
New Revision: 7791
URL: http://svn.gna.org/viewcvs/relax?rev=7791&view=rev
Log:
Merged revisions 7739-7790 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r7741 | semor | 2008-10-16 04:28:28 +0200 (Thu, 16 Oct 2008) | 9 lines
Corrected a name clash.
This originates from a post by Edward at:
https://mail.gna.org/public/relax-devel/2008-10/msg00060.html (message ID:
7f080ed10810151446p58ab78f1u93cb1bc4afbeb202@xxxxxxxxxxxxxx).
I hope this fixes the problem...
........
r7742 | semor | 2008-10-16 04:32:10 +0200 (Thu, 16 Oct 2008) | 6 lines
Passed more arguments to the det_dimensions() function and removed 'self.'
instances.
The test for the support of a XEasy peak list now passes, although there
still may be some bugs
present...
........
r7743 | semor | 2008-10-16 05:02:11 +0200 (Thu, 16 Oct 2008) | 10 lines
Added more to the XEasy support test.
Now, the test fails when reaching the first residue with a non HN/N
assignment. In fact, the reading
of this residue is fine, but no intensity is extracted... hence the failure
of the test.
Now, what do we want to do ? Do we want to support side chain assignments
mixed with backbone
assignments ? In other words, do we want to support multiuple assignment
types in a single
analysis ?
........
r7744 | semor | 2008-10-16 05:47:31 +0200 (Thu, 16 Oct 2008) | 3 lines
Updated some copyrights.
........
r7784 | bugman | 2008-10-16 21:22:02 +0200 (Thu, 16 Oct 2008) | 7 lines
Fix for bug #12456 (https://gna.org/bugs/?12456).
When calculating the errors from replicate spectra, the standard deviations
of all spins were being
averaged rather than the variance. The same error occurred when averaging
across spectra - when not
all are duplicated, triplicated, etc.
........
r7787 | semor | 2008-10-16 22:07:30 +0200 (Thu, 16 Oct 2008) | 7 lines
Set the peak intensity as the default for the reading of NMRView peak list.
The volume was being used. Now, the volume can be used with the use of the
'int_col' variable.
Moreover, the docstrings are now more complete for the of NMRView peak
lists.
........
r7789 | semor | 2008-10-16 22:47:52 +0200 (Thu, 16 Oct 2008) | 3 lines
Corrected the passing of the 'int_col' variable to the intensity extraction
functions.
........
r7790 | semor | 2008-10-16 23:12:10 +0200 (Thu, 16 Oct 2008) | 7 lines
Corrected an argument.
This was pointed out by Edward in a post at :
https://mail.gna.org/public/relax-devel/2008-10/msg00067.html
(message ID: 7f080ed10810161357h418d386bi4d2dd5851d7a4575@xxxxxxxxxxxxxx)
........
Modified:
branches/multi_processor_merge/ (props changed)
branches/multi_processor_merge/generic_fns/intensity.py
branches/multi_processor_merge/prompt/noe.py
branches/multi_processor_merge/prompt/relax_fit.py
branches/multi_processor_merge/specific_fns/relax_fit.py
branches/multi_processor_merge/test_suite/system_tests/peak_lists.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/multi_processor_merge/generic_fns/intensity.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/generic_fns/intensity.py?rev=7791&r1=7790&r2=7791&view=diff
Modified: branches/multi_processor_merge/prompt/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/prompt/noe.py?rev=7791&r1=7790&r2=7791&view=diff
Modified: branches/multi_processor_merge/prompt/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/prompt/relax_fit.py?rev=7791&r1=7790&r2=7791&view=diff
Modified: branches/multi_processor_merge/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/relax_fit.py?rev=7791&r1=7790&r2=7791&view=diff
Modified: branches/multi_processor_merge/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/test_suite/system_tests/peak_lists.py?rev=7791&r1=7790&r2=7791&view=diff
r7791 - in /branches/multi_processor_merge: ./ generic_fns/ prompt/ specific_fns/ test_suite/system_tests/