Author: bugman Date: Mon May 19 11:58:50 2014 New Revision: 23231 URL: http://svn.gna.org/viewcvs/relax?rev=23231&view=rev Log: Merged revisions 23230 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r23230 | bugman | 2014-05-19 11:57:56 +0200 (Mon, 19 May 2014) | 7 lines Exposed the backend verbosity flag of the structure.read_* user functions. This allows the user to silence these user functions, which can be very useful when loading many 3D structures in the scripting UI mode. This change is for the structure.read_gaussian, structure.read_pdb, and structure.read_xyz user functions. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/user_functions/structure.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon May 19 11:58:50 2014 @@ -1 +1 @@ -/trunk:1-23206 +/trunk:1-23230 Modified: branches/frame_order_cleanup/user_functions/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/structure.py?rev=23231&r1=23230&r2=23231&view=diff ============================================================================== --- branches/frame_order_cleanup/user_functions/structure.py (original) +++ branches/frame_order_cleanup/user_functions/structure.py Mon May 19 11:58:50 2014 @@ -644,6 +644,13 @@ desc = "Set the model numbers of the loaded molecules. This can be a single number or list of numbers.", can_be_none = True ) +uf.add_keyarg( + name = "verbosity", + default = 1, + py_type = "int", + desc_short = "verbosity level", + desc = "The amount of information to print out. Set to zero to silence the user function, or one to see all messages." +) # Description. uf.desc.append(Desc_container()) uf.desc[-1].add_paragraph("The atomic positions from a Gaussian log file can be read into relax. If optimisation has been preformed, the last set of atomic coordinates from the log will be read to obtain the final structure. The log file can be Gzip or Bzip2 compressed.") @@ -716,6 +723,13 @@ desc_short = "alternate location indicator", desc = "The PDB ATOM record 'Alternate location indicator' field value.", can_be_none = True +) +uf.add_keyarg( + name = "verbosity", + default = 1, + py_type = "int", + desc_short = "verbosity level", + desc = "The amount of information to print out. Set to zero to silence the user function, or one to see all messages." ) uf.add_keyarg( name = "merge", @@ -805,6 +819,13 @@ desc = "Set the model numbers of the loaded molecules. If unset, then the PDB model numbers will be preserved if they exist. This can be a single number or list of numbers.", can_be_none = True ) +uf.add_keyarg( + name = "verbosity", + default = 1, + py_type = "int", + desc_short = "verbosity level", + desc = "The amount of information to print out. Set to zero to silence the user function, or one to see all messages." +) # Description. uf.desc.append(Desc_container()) uf.desc[-1].add_paragraph("The XYZ files with different models, which defined as an ensemble of the same molecule but with different atomic positions, can be read into relax. If there are several molecules in one xyz file, please separate them into different files and then load them individually. Loading different models and different molecules is controlled by specifying the molecule number read, setting the molecule names, specifying which model to read, and setting the model numbers.")