[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1c126cabc86a
branches:  multiweight
changeset: 6367:1c126cabc86a
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 14:06:49 2018 +0100
description:
Remove deprecated PID functions

details:   https://rivet.hepforge.org/hg/rivet/rev/72dcff14956e
branches:  multiweight
changeset: 6368:72dcff14956e
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 14:14:39 2018 +0100
description:
Remove deprecated WFinder constructor and ParticleVector alias

diffs (truncated from 501 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2011_I928289_W.cc	Tue Jul 03 13:25:17 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2011_I928289_W.cc	Tue Jul 03 14:14:39 2018 +0100
@@ -28,10 +28,10 @@
 
       Cut cut = (Cuts::pT >= 20*GeV);
 
-      WFinder wfinder_el_bare(   fs, cut, PID::ELECTRON, 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.0, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
-      WFinder wfinder_el_dressed(fs, cut, PID::ELECTRON, 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.1, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
-      WFinder wfinder_mu_bare   (fs, cut, PID::MUON    , 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.0, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
-      WFinder wfinder_mu_dressed(fs, cut, PID::MUON    , 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.1, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
+      WFinder wfinder_el_bare(   fs, cut, PID::ELECTRON, 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.0, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
+      WFinder wfinder_el_dressed(fs, cut, PID::ELECTRON, 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.1, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
+      WFinder wfinder_mu_bare   (fs, cut, PID::MUON    , 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.0, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
+      WFinder wfinder_mu_dressed(fs, cut, PID::MUON    , 40.0*GeV, 7000.0*GeV, 25.0*GeV, 0.1, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
 
       declare(wfinder_el_bare   , "WFinder_el_bare");
       declare(wfinder_el_dressed, "WFinder_el_dressed");
--- a/analyses/pluginATLAS/ATLAS_2011_I954993.cc	Tue Jul 03 13:25:17 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2011_I954993.cc	Tue Jul 03 14:14:39 2018 +0100
@@ -34,12 +34,12 @@
 
       VetoedFinalState weinput;
       weinput.addVetoOnThisFinalState(zfinder_e);
-      WFinder wfinder_e(weinput, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.1, WFinder::ClusterPhotons::NODECAY);
+      WFinder wfinder_e(weinput, cuts, PID::ELECTRON, 0*GeV, 1000*GeV, 25*GeV, 0.1, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY);
       declare(wfinder_e, "WFinder_e");
 
       VetoedFinalState wminput;
       wminput.addVetoOnThisFinalState(zfinder_mu);
-      WFinder wfinder_mu(wminput,cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.1, WFinder::ClusterPhotons::NODECAY);
+      WFinder wfinder_mu(wminput,cuts, PID::MUON, 0*GeV, 1000*GeV, 25*GeV, 0.1, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY);
       declare(wfinder_mu, "WFinder_mu");
 
       // Histograms
--- a/analyses/pluginATLAS/ATLAS_2013_I1216670.cc	Tue Jul 03 13:25:17 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2013_I1216670.cc	Tue Jul 03 14:14:39 2018 +0100
@@ -30,11 +30,11 @@
 
       Cut cuts = Cuts::abseta < 2.5 && Cuts::pT >= 20*GeV;
 
-      WFinder w_e_finder(fs, cuts, PID::ELECTRON, 40*GeV, DBL_MAX, 0.0*GeV, 0.0, WFinder::ClusterPhotons::NODECAY,
+      WFinder w_e_finder(fs, cuts, PID::ELECTRON, 40*GeV, DBL_MAX, 0.0*GeV, 0.0, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY,
                          WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
       declare(w_e_finder, "W_E_FINDER");
 
-      WFinder w_mu_finder(fs, cuts, PID::MUON, 40*GeV, DBL_MAX, 0.0*GeV, 0.0, WFinder::ClusterPhotons::NODECAY,
+      WFinder w_mu_finder(fs, cuts, PID::MUON, 40*GeV, DBL_MAX, 0.0*GeV, 0.0, WFinder::ChargedLeptons::PROMPT, WFinder::ClusterPhotons::NODECAY,
                           WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
       declare(w_mu_finder, "W_MU_FINDER");