[Rivet-svn] rivet: Analysis code tidying

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/b3e74155842c
branches:  release-2-6-x
changeset: 6326:b3e74155842c
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jun 07 10:15:08 2018 +0100
description:
Analysis code tidying

diffs (truncated from 334 to 50 lines):

--- a/analyses/pluginATLAS/ATLAS_2018_I1646686.cc	Mon Jun 04 15:22:20 2018 +0100
+++ b/analyses/pluginATLAS/ATLAS_2018_I1646686.cc	Thu Jun 07 10:15:08 2018 +0100
@@ -11,6 +11,7 @@
 
 namespace Rivet {
 
+
   class ATLAS_2018_I1646686 : public Analysis {
 
     public:
@@ -39,7 +40,7 @@
         bookHistograms("tt_Ht",        14);
         bookHistograms("tt_cosThStar", 15);
 
-        //projections
+        // Projections
         Cut dressed_lep = (Cuts::abseta < 2.5) && (Cuts::pT >= 25*GeV);
         Cut eta_full = (Cuts::abseta < 5.0);
 
@@ -56,7 +57,7 @@
         PromptFinalState electrons(el_id);
         electrons.acceptTauDecays(true);
         DressedLeptons dressedelectrons(photons, electrons, 0.1, dressed_lep);
-        addProjection(dressedelectrons, "elecs");
+        declare(dressedelectrons, "elecs");
         DressedLeptons ewdressedelectrons(photons, electrons, 0.1, eta_full);
 
         // Projection to find the muons
@@ -65,10 +66,10 @@
         PromptFinalState muons(mu_id);
         muons.acceptTauDecays(true);
         DressedLeptons dressedmuons(photons, muons, 0.1, dressed_lep);
-        addProjection(dressedmuons, "muons");
+        declare(dressedmuons, "muons");
         DressedLeptons ewdressedmuons(photons, muons, 0.1, eta_full);
 
-        // Projection to find neutrinos for vetoing in jets 
+        // Projection to find neutrinos for vetoing in jets
         IdentifiedFinalState nu_id(fs);
         nu_id.acceptNeutrinos();
         PromptFinalState neutrinos(nu_id);
@@ -83,48 +84,40 @@
         vfs.addVetoOnThisFinalState(ewdressedelectrons);
         vfs.addVetoOnThisFinalState(ewdressedmuons);
         vfs.addVetoOnThisFinalState(neutrinos);
-  
+
         FastJets jets(vfs, FastJets::ANTIKT, 0.4);
         jets.useInvisibles();
-        addProjection(jets, "jets");