[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/337e2b3ef43a
branches:  
changeset: 5966:337e2b3ef43a
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 20 16:00:35 2017 +0100
description:
Update EXAMPLE_SMEAR

details:   https://rivet.hepforge.org/hg/rivet/rev/895b980ba48d
branches:  
changeset: 5967:895b980ba48d
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jul 20 16:19:53 2017 +0100
description:
Normalize MET histo in EXAMPLE_SMEAR

details:   https://rivet.hepforge.org/hg/rivet/rev/fe661bab8db4
branches:  
changeset: 5968:fe661bab8db4
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Aug 07 10:30:41 2017 +0100
description:
Cosmetics

details:   https://rivet.hepforge.org/hg/rivet/rev/a97406f7d126
branches:  
changeset: 5969:a97406f7d126
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Aug 16 12:52:27 2017 +0100
description:
Protect make-plots against NaNs in error band values (patch from Dmitry Kalinkin).

details:   https://rivet.hepforge.org/hg/rivet/rev/11decbec17e2
branches:  
changeset: 5970:11decbec17e2
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Aug 16 12:52:43 2017 +0100
description:
Propagate rapidity scheme

diffs (truncated from 231 to 50 lines):

--- a/ChangeLog	Thu Jul 20 14:47:51 2017 +0100
+++ b/ChangeLog	Wed Aug 16 12:52:43 2017 +0100
@@ -1,5 +1,11 @@
+2017-08-16  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Protect make-plots against NaNs in error band values (patch from Dmitry Kalinkin).
+
 2017-07-20  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Add sumPt, sumP4, sumP3 utility functions.
+
 	* Record truth particles as constituents of SmearedParticles output.
 
 	* Rename UnstableFinalState -> UnstableParticles, and convert
--- a/analyses/pluginMC/EXAMPLE_SMEAR.cc	Thu Jul 20 14:47:51 2017 +0100
+++ b/analyses/pluginMC/EXAMPLE_SMEAR.cc	Wed Aug 16 12:52:43 2017 +0100
@@ -27,7 +27,7 @@
       MissingMomentum mm(Cuts::abseta < 5);
       declare(mm, "MET0");
 
-      SmearedMET smm1(mm, MET_SMEAR_IDENTITY);
+      SmearedMET smm1(mm, MET_SMEAR_ATLAS_RUN2);
       declare(smm1, "MET1");
 
       SmearedMET smm2(mm, [](const Vector3& met, double){ return P3_SMEAR_LEN_GAUSS(met, 0.1*met.mod()); });
@@ -40,15 +40,15 @@
       SmearedJets sj1(fj, JET_SMEAR_IDENTITY);
       declare(sj1, "Jets1");
 
-      SmearedJets sj2(fj, JET_SMEAR_ATLAS_RUN1,
+      SmearedJets sj2(fj, JET_SMEAR_ATLAS_RUN2,
                       [](const Jet& j){ return j.bTagged() ? 0.7*(1 - exp(-j.pT()/(10*GeV))) : 0.01; } );
       declare(sj2, "Jets2");
 
       SmearedJets sj3(fj,
-                      [](const Jet& j){ return j; },
+                      JET_SMEAR_CMS_RUN2,
                       JET_BTAG_EFFS(0.7, 0.1, 0.01),
                       JET_CTAG_PERFECT,
-                      [](const Jet& j){ return 0.8; });
+                      JET_EFF_CONST(0.8));
       declare(sj3, "Jets3");
 
 
@@ -59,21 +59,21 @@
       declare(truthelectrons, "Electrons0");
       DressedLeptons dressedelectrons(photons, truthelectrons, 0.2);
       declare(dressedelectrons, "Electrons1");
-      SmearedParticles recoelectrons(dressedelectrons, ELECTRON_EFF_ATLAS_RUN1, ELECTRON_SMEAR_ATLAS_RUN1);
+      SmearedParticles recoelectrons(dressedelectrons, ELECTRON_EFF_ATLAS_RUN2, ELECTRON_SMEAR_ATLAS_RUN2);