Author: bugman Date: Thu Dec 8 15:42:59 2011 New Revision: 15069 URL: http://svn.gna.org/viewcvs/relax?rev=15069&view=rev Log: A few fixes for the subdirectory. Added: branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py - copied, changed from r15025, branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/animate.py Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2 branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py Copied: branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py (from r15025, branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/animate.py) URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py?p2=branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/animate.py&r1=15025&r2=15069&rev=15069&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/animate.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py Thu Dec 8 15:42:59 2011 @@ -8,13 +8,13 @@ pymol.view() # The cone representation. -pymol.cone_pdb('cone.pdb.gz') +pymol.cone_pdb('cone.pdb') # View all. pymol.command('zoom') # Load the distribution of structures. -pymol.command('load distribution.pdb.gz') +pymol.command('load ../distribution.pdb.gz') # Structure display. pymol.command('hide everything, 1J7O_1st_NH') @@ -30,12 +30,12 @@ pymol.command('cmd.mplay()') # Load the original domain position. -pymol.command('load ../1J7P_1st_NH.pdb') +pymol.command('load ../../1J7P_1st_NH.pdb') pymol.command('hide everything, 1J7P_1st_NH') pymol.command('show spheres, 1J7P_1st_NH') # Load the pivot-CoM axes. -pymol.command('load ../system.pdb') +pymol.command('load ../../system.pdb') pymol.command('show sticks, system') pymol.command('label system, resn') pymol.command('select sele, system and resi 1') @@ -46,7 +46,7 @@ pymol.command('color yellow, sele') # The original rotation axis. -pymol.command('load axis.pdb') +pymol.command('load ../axis.pdb') pymol.command('show sticks, axis') pymol.command('color orange, axis') pymol.command('select sele, axis and name N') Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2?rev=15069&r1=15068&r2=15069&view=diff ============================================================================== Binary files - no diff available. Modified: branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py?rev=15069&r1=15068&r2=15069&view=diff ============================================================================== --- branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py (original) +++ branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py Thu Dec 8 15:42:59 2011 @@ -35,8 +35,8 @@ pipe.create(pipe_name='frame order', pipe_type='frame order') # Read the structures. - structure.read_pdb('1J7O_1st_NH.pdb', dir='..', set_mol_name='N-dom') - structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='..', set_mol_name='C-dom') + structure.read_pdb('1J7O_1st_NH.pdb', dir='../..', set_mol_name='N-dom') + structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='../..', set_mol_name='C-dom') # Load the spins. structure.load_spins('@N') @@ -54,17 +54,17 @@ ln = ['dy', 'tb', 'tm', 'er'] for i in range(len(ln)): ## Load the RDCs. - #rdc.read(align_id=ln[i], file='rdc_%s.txt'%ln[i], res_num_col=2, spin_name_col=5, data_col=6, error_col=7) + #rdc.read(align_id=ln[i], file='rdc_%s.txt'%ln[i], dir='..', res_num_col=2, spin_name_col=5, data_col=6, error_col=7) # The PCS. - pcs.read(align_id=ln[i], file='pcs_%s.txt'%ln[i], res_num_col=2, spin_name_col=5, data_col=6, error_col=7) + pcs.read(align_id=ln[i], file='pcs_%s.txt'%ln[i], dir='..', res_num_col=2, spin_name_col=5, data_col=6, error_col=7) # The temperature and field strength. temperature(id=ln[i], temp=303) frq.set(id=ln[i], frq=900e6) # Load the N-domain tensors (the full tensors). - script('../tensors.py') + script('../../tensors.py') # Define the domains. domain(id='N', spin_id=":1-78") @@ -127,7 +127,7 @@ pipe.create(pipe_name='orig pos', pipe_type='frame order') # Load the structure. - structure.read_pdb('1J7P_1st_NH.pdb', dir='..') + structure.read_pdb('1J7P_1st_NH.pdb', dir='../..') def pymol_display(self): @@ -137,8 +137,8 @@ pipe.switch('frame order') # Load the PDBs of the 2 domains. - structure.read_pdb('1J7O_1st_NH.pdb', dir='..') - structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='..') + structure.read_pdb('1J7O_1st_NH.pdb', dir='../..') + structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='../..') # Create the cone PDB file. frame_order.cone_pdb(file='cone.pdb', force=True) @@ -171,7 +171,7 @@ pipe.create(pipe_name='ave pos', pipe_type='frame order') # Load the structure. - structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='..') + structure.read_pdb('1J7P_1st_NH_rot.pdb', dir='../..') # Rotate all atoms. structure.rotate(R=R, origin=pivot)