[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6c0734c326ca
branches:  release-2-5-x
changeset: 5360:6c0734c326ca
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 28 13:21:34 2016 +0100
description:
Handle exceptions in Particle printing

details:   https://rivet.hepforge.org/hg/rivet/rev/1d03f0da3df4
branches:  release-2-5-x
changeset: 5361:1d03f0da3df4
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jul 29 09:58:58 2016 +0100
description:
Remove conditional building of obsolete, preliminary and unvalidated analyses. Now always built, since there are sufficient warnings.

details:   https://rivet.hepforge.org/hg/rivet/rev/7fe4677b6fc1
branches:  release-2-5-x
changeset: 5362:7fe4677b6fc1
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jul 29 11:16:05 2016 +0100
description:
Improving mkhtml/cmphistos debug options

details:   https://rivet.hepforge.org/hg/rivet/rev/fc395c248a52
branches:  release-2-5-x
changeset: 5363:fc395c248a52
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Jul 29 11:17:55 2016 +0100
description:
Fix match/unmatch arg passing from mkhtml to cmphistos

diffs (truncated from 821 to 50 lines):

--- a/ChangeLog	Fri Jul 29 09:55:09 2016 +0100
+++ b/ChangeLog	Fri Jul 29 11:17:55 2016 +0100
@@ -1,8 +1,14 @@
+2016-07-29  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Remove conditional building of obsolete, preliminary and
+	unvalidated analyses. Now always built, since there are sufficient
+	warnings.
+
 2016-07-28  Holger Schulz  <holger.schulz at cern.ch>
  
-        * Mark D0_2000... WpT analysis validated
+        * Mark D0_2000... W pT analysis validated
         
-	* Mark LHCB_2011_S919... Phi Meson analysis validated
+	* Mark LHCB_2011_S919... phi meson analysis validated
 
 2016-07-25  Andy Buckley  <andy.buckley at cern.ch>
 
--- a/bin/rivet-cmphistos	Fri Jul 29 09:55:09 2016 +0100
+++ b/bin/rivet-cmphistos	Fri Jul 29 11:17:55 2016 +0100
@@ -54,7 +54,9 @@
     parser.add_option("--reftitle", dest="REFTITLE",
                         default='Data', help="Reference data legend entry")
     parser.add_option("--pwd", dest="PATH_PWD", action="store_true", default=False,
-                    help="append the current directory (pwd) to the analysis/data search paths (cf. $RIVET_ANALYSIS/DATA_PATH).")
+                      help="append the current directory (pwd) to the analysis/data search paths (cf. $RIVET_ANALYSIS/DATA_PATH)")
+    parser.add_option("-v", "--verbose", dest="VERBOSE", action="store_true", default=False,
+                      help="produce debug output to the terminal")
 
     stygroup = OptionGroup(parser, "Plot style")
     stygroup.add_option("--linear", action="store_true", dest="LINEAR",
@@ -108,6 +110,7 @@
     for infile in filelist:
         mchistos.setdefault(infile, {})
         analysisobjects = yoda.read(infile, patterns=opts.PATHPATTERNS, unpatterns=opts.PATHUNPATTERNS)
+        print analysisobjects
         for path, ao in analysisobjects.iteritems():
             ## We can't plot non-histograms yet
             # TODO: support counter plotting with a faked x (or y) position and forced plot width/height
--- a/bin/rivet-mkhtml	Fri Jul 29 09:55:09 2016 +0100
+++ b/bin/rivet-mkhtml	Fri Jul 29 11:17:55 2016 +0100
@@ -179,12 +179,12 @@
         if opts.ANAPATTERNS:
             matched = False
             for patt in opts.ANAPATTERNS:
-                if re.search(patt, analysis) is not None:
+                if re.match(patt, analysis) is not None:
                     matched = True
                     break