[Rivet-svn] rivet: 10 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/b4006f22c91a
branches:  
changeset: 5864:b4006f22c91a
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 21 16:45:11 2017 +0100
description:
Add const-efficiency constructor variants for SmearedParticles.

details:   https://rivet.hepforge.org/hg/rivet/rev/5463a0609fb0
branches:  
changeset: 5865:5463a0609fb0
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 21 16:46:16 2017 +0100
description:
Add const efficiency functors operating on Particle, Jet, and FourMomentum.  Add a convenience JET_BTAG_EFFS functor with several constructors to handle mistag rates.

details:   https://rivet.hepforge.org/hg/rivet/rev/c76310ae177b
branches:  
changeset: 5866:c76310ae177b
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jun 21 18:01:34 2017 +0100
description:
Add a full set of in-range kinematics functors: ptInRange, (abs)etaInRange, (abs)phiInRange, deltaRInRange, deltaPhiInRange, deltaEtaInRange, deltaRapInRange.

details:   https://rivet.hepforge.org/hg/rivet/rev/923d71f8ba03
branches:  
changeset: 5867:923d71f8ba03
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 01:18:13 2017 +0100
description:
Vector4.hh: Add mT2(vec,vec) functions.

details:   https://rivet.hepforge.org/hg/rivet/rev/f2847de12152
branches:  
changeset: 5868:f2847de12152
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 12:40:34 2017 +0100
description:
Add a -o output directory option to make-plots

details:   https://rivet.hepforge.org/hg/rivet/rev/bf30165ab787
branches:  
changeset: 5869:bf30165ab787
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 12:53:14 2017 +0100
description:
Partial merge from make-plots

details:   https://rivet.hepforge.org/hg/rivet/rev/3d3d7de252e9
branches:  
changeset: 5870:3d3d7de252e9
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 13:03:55 2017 +0100
description:
Add output directory handling to make-plots-fast

details:   https://rivet.hepforge.org/hg/rivet/rev/bc0abf1eac22
branches:  
changeset: 5871:bc0abf1eac22
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 15:57:21 2017 +0100
description:
Refactoring the PDF & PNG machinery

details:   https://rivet.hepforge.org/hg/rivet/rev/8d94033e8543
branches:  
changeset: 5872:8d94033e8543
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 16:04:27 2017 +0100
description:
Do plot handling in temp dir... better!

details:   https://rivet.hepforge.org/hg/rivet/rev/39179bdae146
branches:  
changeset: 5873:39179bdae146
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 22 16:15:04 2017 +0100
description:
Tweak debug output

diffs (truncated from 1041 to 50 lines):

--- a/ChangeLog	Wed Jun 21 18:10:04 2017 +0200
+++ b/ChangeLog	Thu Jun 22 16:15:04 2017 +0100
@@ -1,3 +1,21 @@
+2017-06-22  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a -o output directory option to make-plots.
+
+	* Vector4.hh: Add mT2(vec,vec) functions.
+
+2017-06-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a full set of in-range kinematics functors: ptInRange,
+	(abs)etaInRange, (abs)phiInRange, deltaRInRange, deltaPhiInRange,
+	deltaEtaInRange, deltaRapInRange.
+
+	* Add a convenience JET_BTAG_EFFS functor with several constructors to handle mistag rates.
+
+	* Add const efficiency functors operating on Particle, Jet, and FourMomentum.
+
+	* Add const-efficiency constructor variants for SmearedParticles.
+
 2017-06-21  Jon Butterworth  <jmb at hep.ucl.ac.uk>
 
 	* Fix normalisations in CMS_2016_I1454211.
--- a/bin/make-plots	Wed Jun 21 18:10:04 2017 +0200
+++ b/bin/make-plots	Thu Jun 22 16:15:04 2017 +0100
@@ -127,7 +127,9 @@
 class InputData(Described):
 
     def __init__(self, filename):
-        self.filename = filename+".dat"
+        self.filename = filename
+        if not self.filename.endswith(".dat"):
+            self.filename += ".dat"
         self.histos = {}
         self.special = {}
         self.functions = {}
@@ -2510,13 +2512,14 @@
     if not os.access(datfile, os.R_OK):
         raise Exception("Could not read data file '%s'" % datfile)
 
-    dirname = os.path.dirname(datfile)
-    datfile = os.path.basename(datfile)
+    datpath = os.path.abspath(datfile)
+    datfile = os.path.basename(datpath)
+    datdir = os.path.dirname(datpath)
+    outdir = opts.OUTPUT_DIR if opts.OUTPUT_DIR else datdir
     filename = datfile.replace('.dat','')
 
     ## Create a temporary directory