[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/5498ddc0b5c3
branches:  multiweight
changeset: 6361:5498ddc0b5c3
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:45:24 2018 +0100
description:
Remove deprecated boostVector

details:   https://rivet.hepforge.org/hg/rivet/rev/805907460847
branches:  multiweight
changeset: 6362:805907460847
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:51:11 2018 +0100
description:
Remove deprecated MAXDOUBLE

details:   https://rivet.hepforge.org/hg/rivet/rev/f48251d01546
branches:  multiweight
changeset: 6363:f48251d01546
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:58:42 2018 +0100
description:
Remove deprecated makeAxisCode

diffs (truncated from 403 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2013_I1216670.cc	Tue Jul 03 12:39:38 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2013_I1216670.cc	Tue Jul 03 12:58:42 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, MAXDOUBLE, 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::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, MAXDOUBLE, 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::ClusterPhotons::NODECAY,
                           WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
       declare(w_mu_finder, "W_MU_FINDER");
 
--- a/analyses/pluginATLAS/ATLAS_2013_I1219109.cc	Tue Jul 03 12:39:38 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2013_I1219109.cc	Tue Jul 03 12:58:42 2018 +0100
@@ -28,7 +28,7 @@
       Cut cuts = Cuts::abseta < 2.5 && Cuts::pT >= 25*GeV;
 
       // W finder for electrons and muons
-      WFinder wf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 0.0*GeV, MAXDOUBLE, 0.0, 0.1,
+      WFinder wf(fs, cuts, _mode==3? PID::MUON : PID::ELECTRON, 0.0*GeV, DBL_MAX, 0.0, 0.1,
                  WFinder::ClusterPhotons::NODECAY, WFinder::AddPhotons::NO, WFinder::MassWindow::MT);
       declare(wf, "WF");
 
--- a/analyses/pluginATLAS/ATLAS_2014_I1298023.cc	Tue Jul 03 12:39:38 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2014_I1298023.cc	Tue Jul 03 12:58:42 2018 +0100
@@ -58,7 +58,7 @@
       const vector<DressedLepton>& leptons = apply<DressedLeptons>(event, "leptons").dressedLeptons();
       if ( leptons.size() < 2 )  vetoEvent;
 
-      double minDR_ll = MAXDOUBLE, mll = -1.0;
+      double minDR_ll = DBL_MAX, mll = -1.0;
       for (unsigned int i = 0; i < leptons.size(); ++i) {
         DressedLepton lep1 = leptons[i];
         for (unsigned int j = i + 1; j < leptons.size(); ++j) {
@@ -78,9 +78,9 @@
 
       const Jets& all_jets = apply<FastJets>(event, "jets").jetsByPt( (Cuts::abseta < 4.5) && (Cuts::pT > 30*GeV) );
       Jets jets;
-      double minDR_overall = MAXDOUBLE;
+      double minDR_overall = DBL_MAX;
       for (const Jet& jet : all_jets) {
-        double minDR_jet = MAXDOUBLE, minDR_electrons = MAXDOUBLE;
+        double minDR_jet = DBL_MAX, minDR_electrons = DBL_MAX;
         for( DressedLepton lep : leptons ) {
           double dr = deltaR(jet, lep);
           if ( dr < minDR_jet )  minDR_jet = dr;