[Rivet-svn] r4207 - trunk/bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Mar  7 11:47:42 2013
New Revision: 4207

Log:
More script tidying, and removal of the ROOT conversion scripts (they will reappear, reworked in YODA)

Deleted:
   trunk/bin/aida2root
   trunk/bin/root2flat
Modified:
   trunk/bin/Makefile.am
   trunk/bin/rivet-cmphistos
   trunk/bin/rivet-rescale

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	Thu Mar  7 11:36:22 2013	(r4206)
+++ trunk/bin/Makefile.am	Thu Mar  7 11:47:42 2013	(r4207)
@@ -1,10 +1,11 @@
 bin_SCRIPTS = rivet-config
-dist_bin_SCRIPTS = aida2root root2flat make-plots
+dist_bin_SCRIPTS = make-plots
 EXTRA_DIST =
 
 RIVETPROGS = \
     rivet \
-    rivet-mkanalysis rivet-buildplugin rivet-findid \
+    rivet-mkanalysis rivet-buildplugin \
+	rivet-findid rivet-which \
     rivet-cmphistos rivet-mkhtml
     # TODO: reinstate  rivet-rescale rivet-mergeruns rivet-merge-CDF_2012_NOTE10874
 if ENABLE_PYEXT

Modified: trunk/bin/rivet-cmphistos
==============================================================================
--- trunk/bin/rivet-cmphistos	Thu Mar  7 11:36:22 2013	(r4206)
+++ trunk/bin/rivet-cmphistos	Thu Mar  7 11:47:42 2013	(r4207)
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-'''\
+"""\
 %prog - generate comparison plots
 
 USAGE:
@@ -8,9 +8,9 @@
 
 where the plot options are described in the make-plots manual in the HISTOGRAM
 section.
-'''
+"""
 
-import rivet, sys, os
+import rivet, yoda, sys, os
 rivet.util.check_python_version()
 rivet.util.set_process_name(os.path.basename(__file__))
 
@@ -108,7 +108,6 @@
     return rivet.PlotParser(opts.PLOTINFODIR, opts.CONFIGFILES)
 
 
-
 def getHistos(filelist):
     """Loop over all input files. Only use the first occurrence of any REF-histogram
     and the first occurrence in each MC file for every MC-histogram."""
@@ -239,19 +238,6 @@
 
 
 if __name__ == '__main__':
-    import os
-    import yoda
-
-    ## Try to rename the process on Linux
-    print __file__
-    rivet.util.set_process_name(__name__)
-
-    ## Try to use Psyco optimiser
-    try:
-        import psyco
-        psyco.full()
-    except ImportError:
-        pass
 
     ## Command line parsing
     parser = getCommandLineOptions()
@@ -350,6 +336,5 @@
         yoda.writeFLAT(anaobjects, sio)
         output += sio.getvalue()
 
-
         ## Write everything into a file
         writeOutput(output, h)

Modified: trunk/bin/rivet-rescale
==============================================================================
--- trunk/bin/rivet-rescale	Thu Mar  7 11:36:22 2013	(r4206)
+++ trunk/bin/rivet-rescale	Thu Mar  7 11:47:42 2013	(r4207)
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
-# TODO: Rewrite or remove
+# TODO: Rewrite or remove. This thing is a UI nightmare: can a command-line interface
+#   possibly encode all the sorts of rescalings that people want to do, or should the
+#   answer just be "Load the objects in YODA and do whatever you want"? We can add some
+#   rivet Python module functions to make loading the appropriate ref data super-easy.
 
 """\
 %prog [-r <REFDATAPATH>] [-O <observable-file>] [-b <bindef> [-b ...]] <AIDAFILE> [<OUTFILE>]