[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e0e9d48204c3
branches:  multiweight
changeset: 6359:e0e9d48204c3
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:32:12 2018 +0100
description:
Remove deprecated addProjection

details:   https://rivet.hepforge.org/hg/rivet/rev/f033b240be51
branches:  multiweight
changeset: 6360:f033b240be51
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:39:38 2018 +0100
description:
Remove deprecated threeCharge

diffs (truncated from 1821 to 50 lines):

--- a/analyses/pluginALICE/ALICE_2012_I1116147.cc	Tue Jul 03 12:13:43 2018 +0100
+++ b/analyses/pluginALICE/ALICE_2012_I1116147.cc	Tue Jul 03 12:39:38 2018 +0100
@@ -16,7 +16,7 @@
     void init() {
 
       const UnstableFinalState ufs(Cuts::absrap < RAPMAX);
-      addProjection(ufs, "UFS");
+      declare(ufs, "UFS");
 
       // Check if cm energy is 7 TeV or 0.9 TeV
       if (fuzzyEquals(sqrtS()/GeV, 900, 1E-3))       _cm_energy_case = 1;
--- a/analyses/pluginALICE/ALICE_2017_I1512110.cc	Tue Jul 03 12:13:43 2018 +0100
+++ b/analyses/pluginALICE/ALICE_2017_I1512110.cc	Tue Jul 03 12:39:38 2018 +0100
@@ -18,7 +18,7 @@
     void init() {
 
       const UnstableFinalState ufs(Cuts::absrap < _rapmax);
-      addProjection(ufs, "UFS");
+      declare(ufs, "UFS");
 
       book(_h_pi0, 3,1,1);
       book(_h_eta, 4,1,1);
--- a/analyses/pluginALICE/ALICE_2017_I1620477.cc	Tue Jul 03 12:13:43 2018 +0100
+++ b/analyses/pluginALICE/ALICE_2017_I1620477.cc	Tue Jul 03 12:39:38 2018 +0100
@@ -19,7 +19,7 @@
     void init() {
 
       const UnstableFinalState ufs(Cuts::absrap < _rapmax);
-      addProjection(ufs, "UFS");
+      declare(ufs, "UFS");
 
       book(_h_pi0,1,1,1);
       book(_h_eta,2,1,1);
--- a/analyses/pluginATLAS/ATLAS_2011_I944826.cc	Tue Jul 03 12:13:43 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2011_I944826.cc	Tue Jul 03 12:39:38 2018 +0100
@@ -101,7 +101,7 @@
         for (const HepMC::GenParticle* gp : particles(decV, HepMC::children)) {
           pTs.push_back(gp->momentum().perp());
           etas.push_back(fabs(gp->momentum().eta()));
-          charges.push_back( Rivet::PID::threeCharge(gp->pdg_id()) );
+          charges.push_back( Rivet::PID::charge3(gp->pdg_id()) );
           // gp->print();
         }
         if ( (pTs[0]/Rivet::GeV < 0.1) || (pTs[1]/Rivet::GeV < 0.1) ) {
--- a/analyses/pluginATLAS/ATLAS_2012_CONF_2012_109.cc	Tue Jul 03 12:13:43 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2012_CONF_2012_109.cc	Tue Jul 03 12:39:38 2018 +0100
@@ -181,7 +181,7 @@
         double fch(0.), fem(0.), eTotal(0.);
         for(const Particle & part : recon_jets[ix].particles()) {
           long id = part.abspid();