r16972 - /branches/interatomic/data/pipe_container.py -- June 19, 2012 - 20:16

Author: bugman
Date: Tue Jun 19 20:16:26 2012
New Revision: 16972

URL: http://svn.gna.org/viewcvs/relax?rev=16972&view=rev
Log:
Fix for the XML file loading of the interatomic data container structures.

The backwards compatibility hook of the previous commit creates interatomic 
data structures,
hence they must be recreated from the XML first.


Modified:
    branches/interatomic/data/pipe_container.py

Modified: branches/interatomic/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/data/pipe_container.py?rev=16972&r1=16971&r2=16972&view=diff
==============================================================================
--- branches/interatomic/data/pipe_container.py (original)
+++ branches/interatomic/data/pipe_container.py Tue Jun 19 20:16:26 2012
@@ -224,13 +224,13 @@
             # Fill its contents.
             self.align_tensors.from_xml(align_tensor_nodes[0], 
file_version=file_version)
 
+        # Recreate the interatomic data structure (this needs to be before 
the 'mol' structure as the backward compatibility hooks can create 
interatomic data containers!).
+        interatom_nodes = pipe_node.getElementsByTagName('interatomic')
+        self.interatomic.from_xml(interatom_nodes, file_version=file_version)
+
         # Recreate the molecule, residue, and spin data structure.
         mol_nodes = pipe_node.getElementsByTagName('mol')
         self.mol.from_xml(mol_nodes, file_version=file_version)
-
-        # Recreate the interatomic data structure.
-        interatom_nodes = pipe_node.getElementsByTagName('interatomic')
-        self.interatomic.from_xml(interatom_nodes, file_version=file_version)
 
         # Get the structural object nodes and, if they exist, fill the 
contents.
         str_nodes = pipe_node.getElementsByTagName('structure')