r20671 - in /trunk/lib/spectrum: nmrpipe.py sparky.py -- August 21, 2013 - 16:29

Author: bugman
Date: Wed Aug 21 16:29:47 2013
New Revision: 20671

URL: http://svn.gna.org/viewcvs/relax?rev=20671&view=rev
Log:
Assignments can now contain lowercase letters in Sparky and NMRPipe seriesTab 
peak lists.


Modified:
    trunk/lib/spectrum/nmrpipe.py
    trunk/lib/spectrum/sparky.py

Modified: trunk/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrpipe.py?rev=20671&r1=20670&r2=20671&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrpipe.py (original)
+++ trunk/lib/spectrum/nmrpipe.py Wed Aug 21 16:29:47 2013
@@ -100,11 +100,11 @@
         assign1, assign2 = re.split('-', line[ass_i])
 
         # The assignment of the first dimension.
-        row1 = re.split('([A-Z]+)', assign1)
+        row1 = re.split('([a-zA-Z]+)', assign1)
         name1 = row1[-2] + row1[-1]
 
         # The assignment of the second dimension.
-        row2 = re.split('([A-Z]+)', assign2)
+        row2 = re.split('([a-zA-Z]+)', assign2)
         name2 = row2[-2] + row2[-1]
 
         # Get the residue number.

Modified: trunk/lib/spectrum/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/sparky.py?rev=20671&r1=20670&r2=20671&view=diff
==============================================================================
--- trunk/lib/spectrum/sparky.py (original)
+++ trunk/lib/spectrum/sparky.py Wed Aug 21 16:29:47 2013
@@ -112,16 +112,16 @@
 
         # Process the assignment for each dimension.
         if dim >= 1:
-            row1 = split('([A-Z]+)', assign1)
+            row1 = split('([a-zA-Z]+)', assign1)
             name1 = row1[-2] + row1[-1]
         if dim >= 2:
-            row2 = split('([A-Z]+)', assign2)
+            row2 = split('([a-zA-Z]+)', assign2)
             name2 = row2[-2] + row2[-1]
         if dim >= 3:
-            row3 = split('([A-Z]+)', assign3)
+            row3 = split('([a-zA-Z]+)', assign3)
             name3 = row3[-2] + row3[-1]
         if dim >= 4:
-            row4 = split('([A-Z]+)', assign4)
+            row4 = split('([a-zA-Z]+)', assign4)
             name4 = row4[-2] + row4[-1]
 
         # The residue number.