Author: bugman
Date: Sat Sep 27 17:38:25 2014
New Revision: 26091
URL: http://svn.gna.org/viewcvs/relax?rev=26091&view=rev
Log:
Improvements for the sectioning printouts for the frame order auto-analysis.
The sections now use the lib.text.formatting subtitle() and subsubtitle()
functions to distinguish
them from the output of all the user functions, which use the section(),
subsection() and
subsubsection() functions. New sectioning printouts have been added for
clarity.
Modified:
branches/frame_order_cleanup/auto_analyses/frame_order.py
Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=26091&r1=26090&r2=26091&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/frame_order.py (original)
+++ branches/frame_order_cleanup/auto_analyses/frame_order.py Sat Sep 27
17:38:25 2014
@@ -62,7 +62,7 @@
from lib.geometry.coord_transform import spherical_to_cartesian
from lib.io import open_write_file
from lib.order.order_parameters import iso_cone_theta_to_S
-from lib.text.sectioning import section, subsection, title
+from lib.text.sectioning import subtitle, subsubtitle, title
from lib.text.table import MULTI_COL, format_table
from pipe_control import pipes, results
from pipe_control.mol_res_spin import return_spin, spin_loop
@@ -440,6 +440,9 @@
# The nested model optimisation protocol.
self.nested_models()
+ # Printout for the final run.
+ subtitle(file=sys.stdout, text="Final results")
+
# The final results does not already exist.
if not self.read_results(model='final', pipe_name='final'):
# Model selection.
@@ -468,12 +471,14 @@
# Output the finishing time.
self.interpreter.time()
+ # Final title printout.
+ subtitle(file=sys.stdout, text="Summaries")
+
# Save the final program state.
if self._final_state:
self.interpreter.state.save('final_state',
dir=self.results_dir, force=True)
# Count the number of Sobol' points and create a summary file.
- section(file=sys.stdout, text="Summaries")
count_sobol_points(dir=self.results_dir, force=True)
summarise(dir=self.results_dir, force=True)
@@ -507,7 +512,7 @@
# The title printout.
title = model[0].upper() + model[1:]
text = "Axis permutation '%s' of the %s frame order model" %
(perm, title)
- section(file=sys.stdout, text=text, prespace=5)
+ subtitle(file=sys.stdout, text=text, prespace=5)
# Output the model staring time.
self.interpreter.time()
@@ -859,7 +864,7 @@
title = model[0].upper() + model[1:]
# Printout.
- section(file=sys.stdout, text="%s frame order model"%title,
prespace=5)
+ subtitle(file=sys.stdout, text="%s frame order model"%title,
prespace=5)
# Output the model staring time.
self.interpreter.time()
@@ -899,7 +904,7 @@
self.interpreter.frame_order.select_model(model=model)
# Copy nested parameters.
- subsection(file=sys.stdout, text="Parameter nesting.")
+ subsubtitle(file=sys.stdout, text="Parameter nesting")
self.nested_params_ave_dom_pos(model)
self.nested_params_eigenframe(model)
self.nested_params_pivot(model)
@@ -908,6 +913,9 @@
# Optimisation using the PCS subset (skipped if a pre-run
directory is supplied).
opt = self.opt_subset
if opt != None and not self.pre_run_flag:
+ # Printout.
+ subsubtitle(file=sys.stdout, text="Optimisation using the PCS
subset")
+
# Zooming grid search.
for i in opt.loop_grid():
# Set the zooming grid search level.
@@ -948,6 +956,9 @@
# Optimisation using the full data set.
opt = self.opt_full
if opt != None:
+ # Printout.
+ subsubtitle(file=sys.stdout, text="Optimisation using the full
data set")
+
for i in opt.loop_min():
# The numerical optimisation settings.
self.interpreter.frame_order.quad_int(opt.get_min_quad_int(i))
@@ -980,7 +991,7 @@
title = model[0].upper() + model[1:]
# Print out.
- section(file=sys.stdout, text="%s frame order model"%title, prespace=5)
+ subtitle(file=sys.stdout, text="%s frame order model"%title,
prespace=5)
# Output the model staring time.
self.interpreter.time()
@@ -1234,7 +1245,7 @@
"""
# Printout.
- subsection(file=sys.stdout, text="Generating the results and data
visualisation files")
+ subsubtitle(file=sys.stdout, text="Generating the results and data
visualisation files")
# Sanity check.
if model != 'final' and model.replace(' permutation A', '').replace('
permutation B', '') != cdp.model:
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
