[Rivet-svn] r3468 - branches/2011-07-aida2yoda/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Mon Oct 31 09:14:49 2011
New Revision: 3468

Log:
merge r3465-3466 from trunk

Modified:
   branches/2011-07-aida2yoda/bin/compare-histos
   branches/2011-07-aida2yoda/bin/rivet-mergeruns

Modified: branches/2011-07-aida2yoda/bin/compare-histos
==============================================================================
--- branches/2011-07-aida2yoda/bin/compare-histos	Mon Oct 31 09:13:43 2011	(r3467)
+++ branches/2011-07-aida2yoda/bin/compare-histos	Mon Oct 31 09:14:49 2011	(r3468)
@@ -152,7 +152,8 @@
     #                     default=None, help="specify a file containing a list of histograms to plot, in the format "
     #                     "/ANALYSIS_ID/histoname, one per line, e.g. '/DELPHI_1996_S3430090/d01-x01-y01'.")
     selgroup.add_option("-m", "--match", action="append",
-                        help="Only write out histograms whose $path/$name string matches these regexes",
+                        help="Only write out histograms whose $path/$name string matches these regexes. The argument "
+                        "may also be a text file.",
                         dest="PATHPATTERNS")
     selgroup.add_option("-M", "--unmatch", action="append",
                         help="Exclude histograms whose $path/$name string matches these regexes",
@@ -209,6 +210,14 @@
     import re
     if opts.PATHPATTERNS is None:
         opts.PATHPATTERNS = []
+    # See if a pattern option is an observable file and append its contents to
+    # the pattern list
+    import os
+    for m in opts.PATHPATTERNS:
+        if os.path.exists(m):
+            f=open(m, "r")
+            opts.PATHPATTERNS.extend([line.strip() for line in f if not line.startswith("#")])
+            f.close()
     opts.PATHPATTERNS = [re.compile(r) for r in opts.PATHPATTERNS]
     if opts.PATHUNPATTERNS is None:
         opts.PATHUNPATTERNS = []

Modified: branches/2011-07-aida2yoda/bin/rivet-mergeruns
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet-mergeruns	Mon Oct 31 09:13:43 2011	(r3467)
+++ branches/2011-07-aida2yoda/bin/rivet-mergeruns	Mon Oct 31 09:14:49 2011	(r3468)
@@ -778,7 +778,7 @@
     ## STAR inclusive jet cross-section
     logging.info("Processing STAR_2006_S6870392")
     useOnePt("/STAR_2006_S6870392/d01-x01-y01", "200", "0")
-    useOnePt("/STAR_2006_S6870392/d02-x01-y01", "200", "3")
+    mergeByPt("/STAR_2006_S6870392/d02-x01-y01", "200")
 
     ## STAR underlying event (Helen Caines)
     logging.info("Processing STAR_2009_UE_HELEN")