r20615 - /branches/peak_intensities/lib/spectrum/objects.py -- August 16, 2013 - 19:34

Author: bugman
Date: Fri Aug 16 19:34:45 2013
New Revision: 20615

URL: http://svn.gna.org/viewcvs/relax?rev=20615&view=rev
Log:
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.


Modified:
    branches/peak_intensities/lib/spectrum/objects.py

Modified: branches/peak_intensities/lib/spectrum/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/lib/spectrum/objects.py?rev=20615&r1=20614&r2=20615&view=diff
==============================================================================
--- branches/peak_intensities/lib/spectrum/objects.py (original)
+++ branches/peak_intensities/lib/spectrum/objects.py Fri Aug 16 19:34:45 2013
@@ -48,24 +48,26 @@
         self._dim = dim
 
 
-    def add(self, mol_names=None, res_nums=None, res_names=None, 
spin_nums=None, spin_names=None, shifts=None, intensity=None):
+    def add(self, mol_names=None, res_nums=None, res_names=None, 
spin_nums=None, spin_names=None, shifts=None, intensity=None, 
intensity_name=None):
         """Add a peak list element.
 
 
-        @keyword mol_names:     The list of molecule names for each 
dimension of the assignment.
-        @type mol_names:        list of str or None
-        @keyword res_nums:      The list of residue numbers for each 
dimension of the assignment.
-        @type res_nums:         list of int or None
-        @keyword res_names:     The list of residue names for each dimension 
of the assignment.
-        @type res_names:        list of str or None
-        @keyword spin_nums:     The list of spin numbers for each dimension 
of the assignment.
-        @type spin_nums:        list of int or None
-        @keyword spin_names:    The list of spin names for each dimension of 
the assignment.
-        @type spin_names:       list of str or None
-        @keyword shifts:        The chemical shifts for each dimension of 
the assignment in ppm.
-        @type shifts:           list of float or None
-        @keyword intensity:     The single intensity value for the peak.
-        @type intensity:        float or None
+        @keyword mol_names:         The list of molecule names for each 
dimension of the assignment.
+        @type mol_names:            list of str or None
+        @keyword res_nums:          The list of residue numbers for each 
dimension of the assignment.
+        @type res_nums:             list of int or None
+        @keyword res_names:         The list of residue names for each 
dimension of the assignment.
+        @type res_names:            list of str or None
+        @keyword spin_nums:         The list of spin numbers for each 
dimension of the assignment.
+        @type spin_nums:            list of int or None
+        @keyword spin_names:        The list of spin names for each 
dimension of the assignment.
+        @type spin_names:           list of str or None
+        @keyword shifts:            The chemical shifts for each dimension 
of the assignment in ppm.
+        @type shifts:               list of float or None
+        @keyword intensity:         The optional intensity value for the 
peak.  This can have multiple values as some peak lists cover multiple 
spectra.
+        @type intensity:            list of float or None
+        @keyword intensity_name:    The optional name of the intensity 
column.  This can be used for automated spectrum ID generation.
+        @type intensity_name:       list of str or None
         """
 
         # Check the arguments.
@@ -94,3 +96,4 @@
         assign.spin_names = spin_names
         assign.shifts = shifts
         assign.intensity = intensity
+        assign.intensity_name = intensity_name