r18613 - in /branches/frame_order_testing: ./ generic_fns/structure/internal.py -- March 04, 2013 - 15:39

Author: bugman
Date: Mon Mar  4 15:39:42 2013
New Revision: 18613

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

........
  r18612 | bugman | 2013-03-04 15:39:13 +0100 (Mon, 04 Mar 2013) | 5 lines
  
  Fix for the internal PDB reading - the MASTER record was being marked as a 
molecule.
  
  Now this record is checked for and the molecule loop terminated.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/structure/internal.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar  4 15:39:42 2013
@@ -1,1 +1,1 @@
-/trunk:1-18609
+/trunk:1-18612

Modified: branches/frame_order_testing/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/internal.py?rev=18613&r1=18612&r2=18613&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/internal.py (original)
+++ branches/frame_order_testing/generic_fns/structure/internal.py Mon Mar  4 
15:39:42 2013
@@ -600,6 +600,10 @@
         for i in range(len(records)):
             # A PDB termination record.
             if records[i][:3] == 'END':
+                break
+
+            # A master record, so we are done.
+            if records[i][:6] == 'MASTER':
                 break
 
             # A model termination record.