r6661 - /branches/rdc_analysis/generic_fns/structure/main.py -- July 04, 2008 - 14:51

Author: bugman
Date: Fri Jul  4 14:51:31 2008
New Revision: 6661

URL: http://svn.gna.org/viewcvs/relax?rev=6661&view=rev
Log:
Added a check for the consistency of the PDB parser.


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

Modified: branches/rdc_analysis/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/generic_fns/structure/main.py?rev=6661&r1=6660&r2=6661&view=diff
==============================================================================
--- branches/rdc_analysis/generic_fns/structure/main.py (original)
+++ branches/rdc_analysis/generic_fns/structure/main.py Fri Jul  4 14:51:31 
2008
@@ -175,6 +175,10 @@
             warn(RelaxNoPDBFileWarning(file_path))
             return
 
+    # Check that the parser is the same as the currently loaded PDB files.
+    if hasattr(cdp, 'structure') and cdp.structure.id != parser:
+        raise RelaxError, "The " + `parser` + " parser does not match the " 
+ `cdp.structure.id` + " parser of the PDB loaded into the current pipe."
+
     # Place the parser specific structural object into the relax data store.
     if parser == 'scientific':
         cdp.structure = Scientific_data()