[Cctbx-cvs] mmtbx/mmtbx/refinement print_statistics.py,1.15,1.16

[Ralf W. Grosse-K. <rw...@us...>]

Update of /cvsroot/cctbx/mmtbx/mmtbx/refinement
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12730/mmtbx/refinement

Modified Files:
	print_statistics.py 
Log Message:
new show_process_info(), currently called unconditionally from make_header() and macro_cycle_header()

Index: print_statistics.py
===================================================================
RCS file: /cvsroot/cctbx/mmtbx/mmtbx/refinement/print_statistics.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** print_statistics.py	8 Jul 2006 00:07:28 -0000	1.15
--- print_statistics.py	9 Jul 2006 04:49:54 -0000	1.16
***************
*** 1,10 ****
--- 1,13 ----
  from cctbx.array_family import flex
  from cctbx import geometry_restraints
+ from libtbx.utils import format_cpu_times
  from libtbx import adopt_init_args
  import sys, os, time
  from libtbx.test_utils import approx_equal
+ from libtbx import introspection
  from cctbx import adptbx
  from stdlib import math
  from cctbx import xray
+ import cctbx.xray.structure_factors.global_counters
  from mmtbx import bulk_solvent
  from mmtbx import max_lik
***************
*** 19,25 ****
--- 22,35 ----
    return total
  
+ def show_process_info(out):
+   print >> out, "\\/"*39
+   introspection.virtual_memory_info().show_if_available(out=out)
+   xray.structure_factors.global_counters.show(out=out)
+   print >> out, format_cpu_times()
+   print >> out, "/\\"*39
  
  def make_header(line, out=None):
    if (out is None): out = sys.stdout
+   show_process_info(out=out)
    header_len = 80
    line_len = len(line)
***************
*** 57,60 ****
--- 67,71 ----
  def macro_cycle_header(macro_cycle, number_of_macro_cycles, out=None):
    if (out is None): out = sys.stdout
+   show_process_info(out=out)
    header_len = 80
    macro_cycle = str(macro_cycle)