Author: semor Date: Wed Jan 9 18:02:54 2008 New Revision: 4571 URL: http://svn.gna.org/viewcvs/relax?rev=4571&view=rev Log: Changed all instances of the 'print_flag' arg to 'verbosity' in the generic directory. Modified: 1.3/generic_fns/dasha.py 1.3/generic_fns/palmer.py 1.3/generic_fns/results.py 1.3/generic_fns/structure.py Modified: 1.3/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=4571&r1=4570&r2=4571&view=diff ============================================================================== --- 1.3/generic_fns/dasha.py (original) +++ 1.3/generic_fns/dasha.py Wed Jan 9 18:02:54 2008 @@ -80,7 +80,7 @@ # Directory creation. if self.dir == None: self.dir = self.run - self.relax.IO.mkdir(self.dir, print_flag=0) + self.relax.IO.mkdir(self.dir, verbosity=0) # Number of field strengths and values. self.num_frq = 0 Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=4571&r1=4570&r2=4571&view=diff ============================================================================== --- 1.3/generic_fns/palmer.py (original) +++ 1.3/generic_fns/palmer.py Wed Jan 9 18:02:54 2008 @@ -78,7 +78,7 @@ # Directory creation. if dir == None: dir = run - self.relax.IO.mkdir(dir, print_flag=0) + self.relax.IO.mkdir(dir, verbosity=0) # Place the arguments into 'self'. self.run = run Modified: 1.3/generic_fns/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/results.py?rev=4571&r1=4570&r2=4571&view=diff ============================================================================== --- 1.3/generic_fns/results.py (original) +++ 1.3/generic_fns/results.py Wed Jan 9 18:02:54 2008 @@ -87,7 +87,7 @@ self.write_function(sys.stdout, run) - def read(self, run=None, file='results', directory=None, file_data=None, format='columnar', print_flag=1): + def read(self, run=None, file='results', directory=None, file_data=None, format='columnar', verbosity=1): """Function for reading the data out of a file.""" # Test if the run exists. @@ -138,10 +138,10 @@ raise RelaxFileEmptyError # Read the results. - self.read_function(run, file_data, print_flag) + self.read_function(run, file_data, verbosity) - def write(self, run=None, file="results", directory=None, force=0, format='columnar', compress_type=1, print_flag=1): + def write(self, run=None, file="results", directory=None, force=0, format='columnar', compress_type=1, verbosity=1): """Create the results file.""" # Test if the run exists. @@ -169,7 +169,7 @@ raise RelaxError, "The " + format + " format is not currently supported for " + self.relax.specific_setup.get_string(function_type) + "." # Open the file for writing. - results_file = self.relax.IO.open_write_file(file_name=file, dir=directory, force=force, compress_type=compress_type, print_flag=print_flag) + results_file = self.relax.IO.open_write_file(file_name=file, dir=directory, force=force, compress_type=compress_type, verbosity=verbosity) # Write the results. self.write_function(results_file, run) Modified: 1.3/generic_fns/structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure.py?rev=4571&r1=4570&r2=4571&view=diff ============================================================================== --- 1.3/generic_fns/structure.py (original) +++ 1.3/generic_fns/structure.py Wed Jan 9 18:02:54 2008 @@ -46,7 +46,7 @@ self.relax = relax # Print flag. - self.print_flag = 1 + self.verbosity = 1 def atom_add(self, atom_id=None, record_name='', atom_name='', res_name='', chain_id='', res_num=None, pos=[None, None, None], segment_id='', element=''): @@ -827,7 +827,7 @@ relax_data_store.pdb[self.run].structures = relax_data_store.pdb[run].structures # Print out. - if self.print_flag: + if self.verbosity: print "Using the structures from the run " + `run` + "." for i in xrange(len(relax_data_store.pdb[self.run].structures)): print relax_data_store.pdb[self.run].structures[i] @@ -841,7 +841,7 @@ # Load the structure i from the PDB file. if type(self.model) == int: # Print out. - if self.print_flag: + if self.verbosity: print "Loading structure " + `self.model` + " from the PDB file." # Load the structure into 'str'. @@ -852,7 +852,7 @@ raise RelaxPdbLoadError, self.file_path # Print the PDB info. - if self.print_flag: + if self.verbosity: print str # Place the structure in 'relax_data_store.pdb[self.run]'. @@ -862,7 +862,7 @@ # Load all structures. else: # Print out. - if self.print_flag: + if self.verbosity: print "Loading all structures from the PDB file." # First model. @@ -885,7 +885,7 @@ break # Print the PDB info. - if self.print_flag: + if self.verbosity: print str # Place the structure in 'relax_data_store.pdb[self.run]'. @@ -895,7 +895,7 @@ i = i + 1 - def read_pdb(self, run=None, file=None, dir=None, model=None, load_seq=1, fail=1, print_flag=1): + def read_pdb(self, run=None, file=None, dir=None, model=None, load_seq=1, fail=1, verbosity=1): """The pdb loading function.""" # Arguments. @@ -905,7 +905,7 @@ self.model = model self.load_seq = load_seq self.fail = fail - self.print_flag = print_flag + self.verbosity = verbosity # Tests. ######## @@ -1004,7 +1004,7 @@ num_str = len(relax_data_store.pdb[self.run].structures) # Print out. - if self.print_flag: + if self.verbosity: if num_str > 1: print "\nCalculating and averaging the unit XH vectors from all structures." else: