r20672 - in /branches/relax_disp: ./ lib/spectrum/nmrpipe.py lib/spectrum/sparky.py -- August 21, 2013 - 16:30

Author: bugman
Date: Wed Aug 21 16:30:37 2013
New Revision: 20672

URL: http://svn.gna.org/viewcvs/relax?rev=20672&view=rev
Log:
Merged revisions 20671 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20671 | bugman | 2013-08-21 16:29:47 +0200 (Wed, 21 Aug 2013) | 3 lines
  
  Assignments can now contain lowercase letters in Sparky and NMRPipe 
seriesTab peak lists.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/spectrum/nmrpipe.py
    branches/relax_disp/lib/spectrum/sparky.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 21 16:30:37 2013
@@ -1,1 +1,1 @@
-/trunk:1-20669
+/trunk:1-20671

Modified: branches/relax_disp/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/spectrum/nmrpipe.py?rev=20672&r1=20671&r2=20672&view=diff
==============================================================================
--- branches/relax_disp/lib/spectrum/nmrpipe.py (original)
+++ branches/relax_disp/lib/spectrum/nmrpipe.py Wed Aug 21 16:30:37 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: branches/relax_disp/lib/spectrum/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/spectrum/sparky.py?rev=20672&r1=20671&r2=20672&view=diff
==============================================================================
--- branches/relax_disp/lib/spectrum/sparky.py (original)
+++ branches/relax_disp/lib/spectrum/sparky.py Wed Aug 21 16:30:37 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.