r6709 - /branches/rdc_analysis/generic_fns/structure/internal.py -- July 05, 2008 - 00:59

Author: bugman
Date: Sat Jul  5 00:59:20 2008
New Revision: 6709

URL: http://svn.gna.org/viewcvs/relax?rev=6709&view=rev
Log:
Modified the __get_chemical_name() to handle unidentifiable residue names.


Modified:
    branches/rdc_analysis/generic_fns/structure/internal.py

Modified: branches/rdc_analysis/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/generic_fns/structure/internal.py?rev=6709&r1=6708&r2=6709&view=diff
==============================================================================
--- branches/rdc_analysis/generic_fns/structure/internal.py (original)
+++ branches/rdc_analysis/generic_fns/structure/internal.py Sat Jul  5 
00:59:20 2008
@@ -108,7 +108,7 @@
 
 
     def __get_chemical_name(self, hetID):
-        """Method for returning the chemical name corresponding to the given 
residue ID.
+        """Return the chemical name corresponding to the given residue ID.
 
         The following names are currently returned::
          ________________________________________________
@@ -125,11 +125,12 @@
          | AVE    | Average vector                      |
          |________|_____________________________________|
 
+        For any other residues, no description is returned.
 
         @param res: The residue ID.
         @type res:  str
         @return:    The chemical name.
-        @rtype:     str
+        @rtype:     str or None
         """
 
         # Tensor.
@@ -159,9 +160,6 @@
         # Average vector.
         if hetID == 'AVE':
             return 'Average vector'
-
-        # Unknown hetID.
-        raise RelaxError, "The residue ID (hetID) " + `hetID` + " is not 
recognised."
 
 
     def __parse_models(self, file_path):