r18357 - in /branches/frame_order_testing: ./ generic_fns/structure/ test_suite/system_tests/scripts/model_free/ -- February 01, 2013 - 16:27

Author: bugman
Date: Fri Feb  1 16:27:40 2013
New Revision: 18357

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

........
  r18355 | bugman | 2013-02-01 15:55:17 +0100 (Fri, 01 Feb 2013) | 3 lines
  
  Removed a debugging print out.
........
  r18356 | bugman | 2013-02-01 15:59:02 +0100 (Fri, 01 Feb 2013) | 7 lines
  
  Fix for the Mf.test_bug_20213_asn_sidechain system test.
  
  The file 
test_suite/shared_data/model_free/bug_20213_asn_sidechain/1U06-H_trunc.pdb 
contains
  alternate location indicators!  Therefore the structure.read_pdb user 
function call requires the
  alt_loc argument.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/structure/internal.py
    
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  1 16:27:40 2013
@@ -1,1 +1,1 @@
-/trunk:1-18353
+/trunk:1-18356

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=18357&r1=18356&r2=18357&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/internal.py (original)
+++ branches/frame_order_testing/generic_fns/structure/internal.py Fri Feb  1 
16:27:40 2013
@@ -2139,7 +2139,6 @@
             if record[0] == 'ATOM' or record[0] == 'HETATM':
                 # Handle the alternate locations.
                 if record[3] != None:
-                    print record
                     # Don't know what to do.
                     if alt_loc == None:
                         raise RelaxError("Multiple alternate location 
indicators are present in the PDB file, but the desired coordinate set has 
not been specified.")

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py?rev=18357&r1=18356&r2=18357&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20213_asn_sidechain.py
 Fri Feb  1 16:27:40 2013
@@ -44,7 +44,7 @@
 data_path = status.install_path + sep + 'test_suite' + sep + 'shared_data' + 
sep + 'model_free' + sep + 'bug_20213_asn_sidechain' + sep
 
 # Load PDB file
-structure.read_pdb(file='./1U06-H_trunc.pdb', dir=data_path, read_mol=1, 
set_mol_name=None, read_model=None, set_model_num=None, parser='internal')
+structure.read_pdb(file='./1U06-H_trunc.pdb', dir=data_path, read_mol=1, 
set_mol_name=None, read_model=None, set_model_num=None, parser='internal', 
alt_loc='A')
 
 # Set up spins and isotopes
 structure.load_spins(spin_id=':47@N*', ave_pos=True)