Author: bugman Date: Wed Dec 10 18:37:41 2008 New Revision: 8185 URL: http://svn.gna.org/viewcvs/relax?rev=8185&view=rev Log: Merged revisions 8180,8183 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r8180 | bugman | 2008-12-10 14:15:47 +0100 (Wed, 10 Dec 2008) | 6 lines Bug fix for the vector_dist() function. The PyMOL structure loading command should not use the file root but the full file name!!! A few unused 'id' file root variables were also deleted. ........ r8183 | bugman | 2008-12-10 18:35:05 +0100 (Wed, 10 Dec 2008) | 3 lines Added a print out for the loading of PDB models. ........ Modified: branches/ave_noe/ (props changed) branches/ave_noe/generic_fns/pymol.py branches/ave_noe/generic_fns/structure/internal.py Propchange: branches/ave_noe/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Dec 10 18:37:41 2008 @@ -1,1 +1,1 @@ -/1.3:1-8160 +/1.3:1-8184 Modified: branches/ave_noe/generic_fns/pymol.py URL: http://svn.gna.org/viewcvs/relax/branches/ave_noe/generic_fns/pymol.py?rev=8185&r1=8184&r2=8185&view=diff ============================================================================== --- branches/ave_noe/generic_fns/pymol.py (original) +++ branches/ave_noe/generic_fns/pymol.py Wed Dec 10 18:37:41 2008 @@ -196,9 +196,6 @@ # Test if the current data pipe exists. pipes.test() - - # The file root. - id = file_root(file) # Read in the cone PDB file. pymol.pipe_write("load " + file) @@ -324,81 +321,78 @@ # Test if the current data pipe exists. pipes.test() + # Read in the tensor PDB file. + pymol.pipe_write("load " + file) + + + # Centre of mass. + ################# + + # Select the COM residue. + pymol.pipe_write("select resn COM") + + # Show the centre of mass as the dots representation. + pymol.pipe_write("show dots, 'sele'") + + # Colour it blue. + pymol.pipe_write("color blue, 'sele'") + + + # The diffusion tensor axes. + ############################ + + # Select the AXS residue. + pymol.pipe_write("select resn AXS") + + # Hide everything. + pymol.pipe_write("hide ('sele')") + + # Show as 'sticks'. + pymol.pipe_write("show sticks, 'sele'") + + # Colour it cyan. + pymol.pipe_write("color cyan, 'sele'") + + # Select the N atoms of the AXS residue (used to display the axis labels). + pymol.pipe_write("select (resn AXS and elem N)") + + # Label the atoms. + pymol.pipe_write("label 'sele', name") + + + + # Monte Carlo simulations. + ########################## + + # Select the SIM residue. + pymol.pipe_write("select resn SIM") + + # Colour it. + pymol.pipe_write("colour cyan, 'sele'") + + + # Clean up. + ########### + + # Remove the selection. + pymol.pipe_write("cmd.delete('sele')") + + +def vector_dist(file=None): + """Display the XH bond vector distribution. + + @keyword file: The vector distribution PDB file. + @type file: str + """ + + # Test if the current data pipe exists. + pipes.test() + # The file root. id = file_root(file) - # Read in the tensor PDB file. + # Read in the vector distribution PDB file. pymol.pipe_write("load " + file) - - - # Centre of mass. - ################# - - # Select the COM residue. - pymol.pipe_write("select resn COM") - - # Show the centre of mass as the dots representation. - pymol.pipe_write("show dots, 'sele'") - - # Colour it blue. - pymol.pipe_write("color blue, 'sele'") - - - # The diffusion tensor axes. - ############################ - - # Select the AXS residue. - pymol.pipe_write("select resn AXS") - - # Hide everything. - pymol.pipe_write("hide ('sele')") - - # Show as 'sticks'. - pymol.pipe_write("show sticks, 'sele'") - - # Colour it cyan. - pymol.pipe_write("color cyan, 'sele'") - - # Select the N atoms of the AXS residue (used to display the axis labels). - pymol.pipe_write("select (resn AXS and elem N)") - - # Label the atoms. - pymol.pipe_write("label 'sele', name") - - - - # Monte Carlo simulations. - ########################## - - # Select the SIM residue. - pymol.pipe_write("select resn SIM") - - # Colour it. - pymol.pipe_write("colour cyan, 'sele'") - - - # Clean up. - ########### - - # Remove the selection. - pymol.pipe_write("cmd.delete('sele')") - - -def vector_dist(file=None): - """Display the XH bond vector distribution. - - @keyword file: The vector distribution PDB file. - @type file: str - """ - - # Test if the current data pipe exists. - pipes.test() - - # The file root. - id = file_root(file) - - # Read in the vector distribution PDB file. - pymol.pipe_write("load " + id) # Create a surface. Modified: branches/ave_noe/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/branches/ave_noe/generic_fns/structure/internal.py?rev=8185&r1=8184&r2=8185&view=diff ============================================================================== --- branches/ave_noe/generic_fns/structure/internal.py (original) +++ branches/ave_noe/generic_fns/structure/internal.py Wed Dec 10 18:37:41 2008 @@ -909,6 +909,10 @@ if model != None and model != model_num: continue + # Print out. + if model_num != None: + print "Loading model: " + `model_num` + # Add an empty structure. self.add_struct(name=name, model=model_num, file=file, path=path, str=Structure_container(), struct_index=struct_index)