r21812 - /trunk/lib/spectrum/nmrpipe.py -- December 06, 2013 - 09:57

Author: tlinnet
Date: Fri Dec  6 09:57:14 2013
New Revision: 21812

URL: http://svn.gna.org/viewcvs/relax?rev=21812&view=rev
Log:
Issued a warning instead of error, when loadning spin residue names from a 
NMRPipe SeriesTab formatted file.

Work in progress for Support Request #3044, 
(https://gna.org/support/index.php?3044) - Load spins from SPARKY list.

Modified:
    trunk/lib/spectrum/nmrpipe.py

Modified: trunk/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrpipe.py?rev=21812&r1=21811&r2=21812&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrpipe.py (original)
+++ trunk/lib/spectrum/nmrpipe.py Fri Dec  6 09:57:14 2013
@@ -114,12 +114,19 @@
         except:
             raise RelaxError("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s'." % line[0])
 
-        # The residue name.
+        # The residue name for dimension 1.
         try:
             res_name1 = row1[-4]
+        except:
+            raise RelaxWarning("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s' for residue name dimension 1.\nSetting 
residue name to None." % line[0])
+            res_name1 = None
+
+        # The residue name for dimension 2.
+        try:
             res_name2 = row2[-4]
         except:
-            raise RelaxError("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s' for residue name." % line[0])
+            raise RelaxWarning("Improperly formatted NMRPipe SeriesTab file, 
cannot process the assignment '%s' for residue name dimension 2.\nSetting 
residue name to None." % line[0])
+            res_name2 = None
 
         # Get the intensities.
         try: