Author: bugman Date: Tue May 27 17:06:23 2014 New Revision: 23474 URL: http://svn.gna.org/viewcvs/relax?rev=23474&view=rev Log: Deletion of the pipe_control.structure.main.create_cone_pdb() function. This is only used in the frame order analysis, but has been made redundant by the lib.structure.represent.cone.cone() function. Modified: trunk/pipe_control/structure/main.py Modified: trunk/pipe_control/structure/main.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/main.py?rev=23474&r1=23473&r2=23474&view=diff ============================================================================== --- trunk/pipe_control/structure/main.py (original) +++ trunk/pipe_control/structure/main.py Tue May 27 17:06:23 2014 @@ -119,65 +119,6 @@ # Add the atoms. cdp.structure.connect_atom(index1=index1, index2=index2) - - -def create_cone_pdb(mol=None, cone=None, start_res=1, apex=None, axis=None, R=None, inc=None, scale=30.0, distribution='regular', file=None, dir=None, force=False, axis_flag=True): - """Create a PDB representation of the given cone object. - - @keyword mol: The molecule container. - @type mol: MolContainer instance - @keyword cone: The cone object. This should provide the limit_check() method with determines the limits of the distribution accepting two arguments, the polar angle phi and the azimuthal angle theta, and return True if the point is in the limits or False if outside. It should also provide the theta_max() method for returning the theta value for the given phi, the phi_max() method for returning the phi value for the given theta. - @type cone: class instance - @keyword start_res: The starting residue number. - @type start_res: str - @keyword apex: The apex of the cone. - @type apex: rank-1, 3D numpy array - @keyword axis: The central axis of the cone. If not supplied, the z-axis will be used. - @type axis: rank-1, 3D numpy array - @keyword R: The rotation matrix. - @type R: rank-2, 3D numpy array - @keyword inc: The increment number used to determine the number of latitude and longitude lines. - @type inc: int - @keyword scale: The scaling factor to stretch the unit cone by. - @type scale: float - @keyword distribution: The type of point distribution to use. This can be 'uniform' or 'regular'. - @type distribution: str - @keyword file: The name of the PDB file to create. - @type file: str - @keyword dir: The name of the directory to place the PDB file into. - @type dir: str - @keyword force: Flag which if set to True will overwrite any pre-existing file. - @type force: bool - @keyword axis_flag: A flag which if True will create the cone's axis. - @type axis_flag: bool - """ - - # No molecule supplied. - if mol == None: - # Create the structural object. - structure = Internal() - - # Add a molecule. - structure.add_molecule(name='cone') - - # Alias the single molecule from the single model. - mol = structure.structural_data[0].mol[0] - - # Create the object. - cone(mol=mol, cone=cone, start_res=start_res, apex=apex, axis=axis, R=R, inc=inc, scale=scale, distribution=distribution, axis_flag=axis_flag) - - # Create the PDB file. - if file != None: - print("\nGenerating the PDB file.") - pdb_file = open_write_file(file_name=file, dir=dir, force=force) - structure.write_pdb(pdb_file) - pdb_file.close() - - # Add the file to the results file list. - if not hasattr(cdp, 'result_files'): - cdp.result_files = [] - cdp.result_files.append(['cone_pdb', 'Cone PDB', get_file_path(file, dir)]) - status.observers.result_file.notify() def create_diff_tensor_pdb(scale=1.8e-6, file=None, dir=None, force=False):