Menu

Commit [r20624]  Maximize  Restore  History

Merged revisions 20579,20598-20619 via svnmerge from

svn+ssh://bugman@.../svn/relax/branches/peak_intensities

........
r20579 | bugman | 2013-08-13 11:58:38 +0200 (Tue, 13 Aug 2013) | 6 lines

Modification of the spectrum.read_intensities user function front end.

The heteronuc and proton arguments have been eliminated. Instead the new dim argument is used to
associate the data with the spins of any dimension in the peak list.
........
r20598 | bugman | 2013-08-15 12:01:52 +0200 (Thu, 15 Aug 2013) | 3 lines

Replaced the 'heteronuc' and 'proton' arguments of the spectrum.read_intensities user function backend with 'dim'.
........
r20599 | bugman | 2013-08-16 17:15:24 +0200 (Fri, 16 Aug 2013) | 6 lines

Created the new lib.spectrum.objects module.

This will hold temporary data structures for representing peak lists and other spectral data. The
module currently contains the Peak_list class which is used to hold peak list data.
........
r20600 | bugman | 2013-08-16 17:18:21 +0200 (Fri, 16 Aug 2013) | 3 lines

Started to shift the spectrum.read_intensities user function backend to use lib.spectrum.peak_list.
........
r20601 | bugman | 2013-08-16 17:49:45 +0200 (Fri, 16 Aug 2013) | 3 lines

The pipe_control.spectrum.read_intensities() function now works with the Peak_list object.
........
r20602 | bugman | 2013-08-16 17:50:26 +0200 (Fri, 16 Aug 2013) | 3 lines

The Peak_list object is now used by the lib.spectrum.peak_list.read_peak_list() function.
........
r20603 | bugman | 2013-08-16 18:28:25 +0200 (Fri, 16 Aug 2013) | 3 lines

Fix for the lib.spectrum.objects.Peak_list object - the Assignment object was not initialised.
........
r20604 | bugman | 2013-08-16 18:31:04 +0200 (Fri, 16 Aug 2013) | 3 lines

Small fix for how pipe_control.spectrum.read() uses the Peak_list object.
........
r20605 | bugman | 2013-08-16 18:31:40 +0200 (Fri, 16 Aug 2013) | 3 lines

The lib.software.sparky.read_list_intensity() function now operates on the Peak_list object.
........
r20606 | bugman | 2013-08-16 18:42:46 +0200 (Fri, 16 Aug 2013) | 3 lines

Changed the spectrum.read_intensities dim argument default to w2 and improved the long description.
........
r20607 | bugman | 2013-08-16 18:44:54 +0200 (Fri, 16 Aug 2013) | 5 lines

Fix for the assignment handling in the lib.software.sparky.read_peak_list() function.

The first element is usually the indirect dimension or w2.
........
r20608 | bugman | 2013-08-16 18:48:15 +0200 (Fri, 16 Aug 2013) | 5 lines

Fix for many of the Peak_list system tests for the user function argument changes.

The heteronuc and proton arguments have been replaced by the dim argument.
........
r20609 | bugman | 2013-08-16 18:57:15 +0200 (Fri, 16 Aug 2013) | 3 lines

The lib.software.xeasy.read_list_intensity() function now operates on the Peak_list object.
........
r20610 | bugman | 2013-08-16 18:58:58 +0200 (Fri, 16 Aug 2013) | 3 lines

Small docstring change for lib.software.sparky.read_list_intensity().
........
r20611 | bugman | 2013-08-16 19:02:03 +0200 (Fri, 16 Aug 2013) | 3 lines

The lib.software.nmrview.read_list_intensity() function now operates on the Peak_list object.
........
r20612 | bugman | 2013-08-16 19:14:57 +0200 (Fri, 16 Aug 2013) | 3 lines

The lib.spectrum.peak_list.intensity_generic() function now operates on the Peak_list object.
........
r20613 | bugman | 2013-08-16 19:16:39 +0200 (Fri, 16 Aug 2013) | 5 lines

Fixes for the pipe_control.spectrum.read() function.

An error was referencing a now non-existent variable and the docstring has been fixed.
........
r20614 | bugman | 2013-08-16 19:17:01 +0200 (Fri, 16 Aug 2013) | 3 lines

Removal of a now unused list variable.
........
r20615 | bugman | 2013-08-16 19:34:45 +0200 (Fri, 16 Aug 2013) | 6 lines

The Peak_list object can now store peak intensity names.

This is for peak lists such as from NMRPipe seriersTab files where the peak list covers multiple
spectra.
........
r20616 | bugman | 2013-08-16 19:42:56 +0200 (Fri, 16 Aug 2013) | 3 lines

The NMRPipe seriesTab peak lists are now supported through the Peak_list object.
........
r20617 | bugman | 2013-08-16 19:54:36 +0200 (Fri, 16 Aug 2013) | 3 lines

Unit test fixes for the spectrum.read_intensities user function argument changes.
........
r20618 | bugman | 2013-08-16 19:56:45 +0200 (Fri, 16 Aug 2013) | 3 lines

Fixes for a few system tests for the spectrum.read_intensities user function argument changes.
........
r20619 | bugman | 2013-08-16 20:11:07 +0200 (Fri, 16 Aug 2013) | 3 lines

Fixes for a few GUI tests for the spectrum.read_intensities user function argument changes.
........

bugman 2013-08-16

copied /branches/peak_intensities/lib/spectrum/objects.py -> /trunk/lib/spectrum/objects.py
changed /trunk
changed /trunk/lib/software/nmrpipe.py
changed /trunk/lib/software/nmrview.py
changed /trunk/lib/software/sparky.py
changed /trunk/lib/software/xeasy.py
changed /trunk/lib/spectrum/__init__.py
changed /trunk/lib/spectrum/peak_list.py
changed /trunk/pipe_control/spectrum.py
changed /trunk/test_suite/gui_tests/noe.py
changed /trunk/test_suite/gui_tests/rx.py
changed /trunk/test_suite/system_tests/peak_lists.py
changed /trunk/test_suite/system_tests/scripts/1UBQ_relax_fit.py
changed /trunk/test_suite/system_tests/scripts/noe.py
changed /trunk/test_suite/unit_tests/_prompt/test_spectrum.py
changed /trunk/user_functions/spectrum.py
/trunk
Directory.
/trunk/lib/software/nmrpipe.py Diff Switch to side-by-side view
Loading...
/trunk/lib/software/nmrview.py Diff Switch to side-by-side view
Loading...
/trunk/lib/software/sparky.py Diff Switch to side-by-side view
Loading...
/trunk/lib/software/xeasy.py Diff Switch to side-by-side view
Loading...
/trunk/lib/spectrum/__init__.py Diff Switch to side-by-side view
Loading...
/trunk/lib/spectrum/peak_list.py Diff Switch to side-by-side view
Loading...
/trunk/pipe_control/spectrum.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/gui_tests/noe.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/gui_tests/rx.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/peak_lists.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/scripts/1UBQ_relax_fit.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/scripts/noe.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/unit_tests/_prompt/test_spectrum.py Diff Switch to side-by-side view
Loading...
/trunk/user_functions/spectrum.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.