|
[Rivet-svn] r4212 - in trunk: . include/Rivet include/Rivet/Projections src/Analyses src/Projectionsblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Mar 7 17:34:42 GMT 2013
Author: buckley Date: Thu Mar 7 17:34:41 2013 New Revision: 4212 Log: Renaming existing uses of ParticleVector to the new 'Particles' type. Modified: trunk/ChangeLog trunk/include/Rivet/Jet.hh trunk/include/Rivet/Projections/ChargedLeptons.hh trunk/include/Rivet/Projections/FastJets.hh trunk/include/Rivet/Projections/FinalState.hh trunk/include/Rivet/Projections/InitialQuarks.hh trunk/include/Rivet/Projections/InvMassFinalState.hh trunk/include/Rivet/Projections/JetAlg.hh trunk/include/Rivet/Projections/LeptonClusters.hh trunk/include/Rivet/Projections/WFinder.hh trunk/include/Rivet/Projections/ZFinder.hh trunk/src/Analyses/ALEPH_1996_S3196992.cc trunk/src/Analyses/ALEPH_1996_S3486095.cc trunk/src/Analyses/ALICE_2012_I1181770.cc trunk/src/Analyses/ARGUS_1993_S2653028.cc trunk/src/Analyses/ARGUS_1993_S2669951.cc trunk/src/Analyses/ARGUS_1993_S2789213.cc trunk/src/Analyses/ATLAS_2010_S8894728.cc trunk/src/Analyses/ATLAS_2010_S8914702.cc trunk/src/Analyses/ATLAS_2010_S8919674.cc trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc trunk/src/Analyses/ATLAS_2011_CONF_2011_098.cc trunk/src/Analyses/ATLAS_2011_S8983313.cc trunk/src/Analyses/ATLAS_2011_S8994773.cc trunk/src/Analyses/ATLAS_2011_S9002537.cc trunk/src/Analyses/ATLAS_2011_S9019561.cc trunk/src/Analyses/ATLAS_2011_S9041966.cc trunk/src/Analyses/ATLAS_2011_S9108483.cc trunk/src/Analyses/ATLAS_2011_S9120807.cc trunk/src/Analyses/ATLAS_2011_S9212183.cc trunk/src/Analyses/ATLAS_2011_S9212353.cc trunk/src/Analyses/ATLAS_2011_S9225137.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_001.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc trunk/src/Analyses/ATLAS_2012_CONF_2012_153.cc trunk/src/Analyses/ATLAS_2012_I1082009.cc trunk/src/Analyses/ATLAS_2012_I1083318.cc trunk/src/Analyses/ATLAS_2012_I1091481.cc trunk/src/Analyses/ATLAS_2012_I1093738.cc trunk/src/Analyses/ATLAS_2012_I1094568.cc trunk/src/Analyses/ATLAS_2012_I1095236.cc trunk/src/Analyses/ATLAS_2012_I1112263.cc trunk/src/Analyses/ATLAS_2012_I1117704.cc trunk/src/Analyses/ATLAS_2012_I1118269.cc trunk/src/Analyses/ATLAS_2012_I1125575.cc trunk/src/Analyses/ATLAS_2012_I1125961.cc trunk/src/Analyses/ATLAS_2012_I1126136.cc trunk/src/Analyses/ATLAS_2012_I1180197.cc trunk/src/Analyses/ATLAS_2012_I1183818.cc trunk/src/Analyses/ATLAS_2012_I1186556.cc trunk/src/Analyses/ATLAS_2012_I1190891.cc trunk/src/Analyses/ATLAS_2012_I943401.cc trunk/src/Analyses/ATLAS_2012_I946427.cc trunk/src/Analyses/ATLAS_2013_I1217867.cc trunk/src/Analyses/BABAR_2003_I593379.cc trunk/src/Analyses/BABAR_2007_S7266081.cc trunk/src/Analyses/BELLE_2001_S4598261.cc trunk/src/Analyses/CDF_1993_S2742446.cc trunk/src/Analyses/CDF_2004_S5839831.cc trunk/src/Analyses/CDF_2005_S6080774.cc trunk/src/Analyses/CDF_2006_S6653332.cc trunk/src/Analyses/CDF_2008_NOTE_9351.cc trunk/src/Analyses/CDF_2008_S7540469.cc trunk/src/Analyses/CDF_2008_S7541902.cc trunk/src/Analyses/CDF_2008_S8095620.cc trunk/src/Analyses/CDF_2009_S8436959.cc trunk/src/Analyses/CDF_2010_S8591881_DY.cc trunk/src/Analyses/CDF_2012_NOTE10874.cc trunk/src/Analyses/CMS_2011_I954992.cc trunk/src/Analyses/CMS_2011_S8941262.cc trunk/src/Analyses/CMS_2011_S9120041.cc trunk/src/Analyses/CMS_2012_I1107658.cc trunk/src/Analyses/CMS_2012_PAS_FWD_11_003.cc trunk/src/Analyses/D0_2001_S4674421.cc trunk/src/Analyses/D0_2007_S7075677.cc trunk/src/Analyses/D0_2010_S8570965.cc trunk/src/Analyses/D0_2010_S8821313.cc trunk/src/Analyses/DELPHI_1996_S3430090.cc trunk/src/Analyses/H1_1994_S2919893.cc trunk/src/Analyses/H1_2000_S4129130.cc trunk/src/Analyses/LHCB_2010_I867355.cc trunk/src/Analyses/MC_DIPHOTON.cc trunk/src/Analyses/MC_PHOTONINC.cc trunk/src/Analyses/MC_PHOTONJETS.cc trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc trunk/src/Analyses/MC_PHOTONS.cc trunk/src/Analyses/MC_SUSY.cc trunk/src/Analyses/MC_VH2BB.cc trunk/src/Analyses/OPAL_1993_S2692198.cc trunk/src/Analyses/SLD_1999_S3743934.cc trunk/src/Analyses/SLD_2004_S5693039.cc trunk/src/Projections/FParameter.cc trunk/src/Projections/FastJets.cc trunk/src/Projections/FinalState.cc trunk/src/Projections/FoxWolframMoments.cc trunk/src/Projections/Hemispheres.cc trunk/src/Projections/InvMassFinalState.cc trunk/src/Projections/LeadingParticlesFinalState.cc trunk/src/Projections/LeptonClusters.cc trunk/src/Projections/Multiplicity.cc trunk/src/Projections/Sphericity.cc trunk/src/Projections/VetoedFinalState.cc trunk/src/Projections/WFinder.cc trunk/src/Projections/ZFinder.cc Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/ChangeLog Thu Mar 7 17:34:41 2013 (r4212) @@ -1,5 +1,7 @@ 2013-03-07 Andy Buckley <andy.buckley at cern.ch> + * Renaming existing uses of ParticleVector to the new 'Particles' type. + * Updating util classes, projections, and analyses to deal with the HepMC return value changes. Modified: trunk/include/Rivet/Jet.hh ============================================================================== --- trunk/include/Rivet/Jet.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Jet.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -161,7 +161,7 @@ private: /// Full particle information including tracks, ID etc - ParticleVector _particles; + Particles _particles; // /// The particle momenta. // /// @todo Eliminate this to ensure consistency. Modified: trunk/include/Rivet/Projections/ChargedLeptons.hh ============================================================================== --- trunk/include/Rivet/Projections/ChargedLeptons.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/ChargedLeptons.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -39,7 +39,7 @@ public: /// Access the projected leptons. - const ParticleVector& chargedLeptons() const { + const Particles& chargedLeptons() const { return _theParticles; } Modified: trunk/include/Rivet/Projections/FastJets.hh ============================================================================== --- trunk/include/Rivet/Projections/FastJets.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/FastJets.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -200,7 +200,7 @@ public: /// Do the calculation locally (no caching). - void calc(const ParticleVector& ps); + void calc(const Particles& ps); private: Modified: trunk/include/Rivet/Projections/FinalState.hh ============================================================================== --- trunk/include/Rivet/Projections/FinalState.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/FinalState.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -36,52 +36,52 @@ /// Get the final-state particles. - virtual const ParticleVector& particles() const { return _theParticles; } + virtual const Particles& particles() const { return _theParticles; } /// Get the final-state particles, ordered by supplied sorting function object. template <typename F> - const ParticleVector& particles(F sorter) const { + const Particles& particles(F sorter) const { std::sort(_theParticles.begin(), _theParticles.end(), sorter); return _theParticles; } /// Get the final-state particles, ordered by decreasing \f$ p_T \f$. - const ParticleVector& particlesByPt() const { + const Particles& particlesByPt() const { return particles(cmpParticleByPt); } /// Get the final-state particles, ordered by decreasing \f$ p \f$. - const ParticleVector& particlesByP() const { + const Particles& particlesByP() const { return particles(cmpParticleByP); } /// Get the final-state particles, ordered by decreasing \f$ E \f$. - const ParticleVector& particlesByE() const { + const Particles& particlesByE() const { return particles(cmpParticleByE); } /// Get the final-state particles, ordered by decreasing \f$ E_T \f$. - const ParticleVector& particlesByEt() const { + const Particles& particlesByEt() const { return particles(cmpParticleByEt); } /// Get the final-state particles, ordered by increasing \f$ \eta \f$. - const ParticleVector& particlesByEta() const { + const Particles& particlesByEta() const { return particles(cmpParticleByAscPseudorapidity); } /// Get the final-state particles, ordered by increasing \f$ |\eta| \f$. - const ParticleVector& particlesByModEta() const { + const Particles& particlesByModEta() const { return particles(cmpParticleByAscAbsPseudorapidity); } /// Get the final-state particles, ordered by increasing \f$ y \f$. - const ParticleVector& particlesByRapidity() const { + const Particles& particlesByRapidity() const { return particles(cmpParticleByAscRapidity); } /// Get the final-state particles, ordered by increasing \f$ |y| \f$. - const ParticleVector& particlesByModRapidity() const { + const Particles& particlesByModRapidity() const { return particles(cmpParticleByAscAbsRapidity); } @@ -100,7 +100,7 @@ public: typedef Particle entity_type; - typedef ParticleVector collection_type; + typedef Particles collection_type; /// Template-usable interface common to JetAlg. const collection_type& entities() const { @@ -129,7 +129,7 @@ double _ptmin; /// The final-state particles. - mutable ParticleVector _theParticles; + mutable Particles _theParticles; }; Modified: trunk/include/Rivet/Projections/InitialQuarks.hh ============================================================================== --- trunk/include/Rivet/Projections/InitialQuarks.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/InitialQuarks.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -33,7 +33,7 @@ //@} /// Access the projected final-state particles. - virtual const ParticleVector& particles() const { return _theParticles; } + virtual const Particles& particles() const { return _theParticles; } /// Is this final state empty? virtual bool empty() const { return _theParticles.empty(); } @@ -53,7 +53,7 @@ protected: /// The final-state particles. - ParticleVector _theParticles; + Particles _theParticles; }; Modified: trunk/include/Rivet/Projections/InvMassFinalState.hh ============================================================================== --- trunk/include/Rivet/Projections/InvMassFinalState.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/InvMassFinalState.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -56,7 +56,7 @@ } /// Operate on a given particle vector directly instead of through project (no caching) - void calc(const ParticleVector& inparticles); + void calc(const Particles& inparticles); private: Modified: trunk/include/Rivet/Projections/JetAlg.hh ============================================================================== --- trunk/include/Rivet/Projections/JetAlg.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/JetAlg.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -174,7 +174,7 @@ collection_type entities() const { return jets(); } /// Do the calculation locally (no caching). - virtual void calc(const ParticleVector& ps) = 0; + virtual void calc(const Particles& ps) = 0; protected: Modified: trunk/include/Rivet/Projections/LeptonClusters.hh ============================================================================== --- trunk/include/Rivet/Projections/LeptonClusters.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/LeptonClusters.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -26,11 +26,11 @@ } const Particle& constituentLepton() const { return _constituentLepton; } - const ParticleVector& constituentPhotons() const { return _constituentPhotons; } + const Particles& constituentPhotons() const { return _constituentPhotons; } private: - ParticleVector _constituentPhotons; + Particles _constituentPhotons; Particle _constituentLepton; }; Modified: trunk/include/Rivet/Projections/WFinder.hh ============================================================================== --- trunk/include/Rivet/Projections/WFinder.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/WFinder.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -89,7 +89,7 @@ /// Access to the found bosons (currently either 0 or 1) - const ParticleVector& bosons() const { return _bosons; } + const Particles& bosons() const { return _bosons; } /// Access to the W constituent clustered leptons (currently either of /// size 0 if no boson was found or 1 if one boson was found) @@ -161,13 +161,13 @@ PdgId _nu_pid; /// list of found bosons (currently either 0 or 1) - ParticleVector _bosons; + Particles _bosons; /// Constituent leptons (currently either 0 or 1) - ParticleVector _constituentLeptons; + Particles _constituentLeptons; /// Constituent neutrinos (currently either 0 or 1) - ParticleVector _constituentNeutrinos; + Particles _constituentNeutrinos; }; Modified: trunk/include/Rivet/Projections/ZFinder.hh ============================================================================== --- trunk/include/Rivet/Projections/ZFinder.hh Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/include/Rivet/Projections/ZFinder.hh Thu Mar 7 17:34:41 2013 (r4212) @@ -80,7 +80,7 @@ /// Access to the found bosons (currently either 0 or 1) - const ParticleVector& bosons() const { return _bosons; } + const Particles& bosons() const { return _bosons; } /// Access to the Z constituent clustered leptons /// (e.g. for more fine-grained cuts on the clustered leptons) @@ -136,7 +136,7 @@ PdgId _pid; /// list of found bosons (currently either 0 or 1) - ParticleVector _bosons; + Particles _bosons; /// Clustered leptons vector<Particle> _constituents; Modified: trunk/src/Analyses/ALEPH_1996_S3196992.cc ============================================================================== --- trunk/src/Analyses/ALEPH_1996_S3196992.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ALEPH_1996_S3196992.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -54,8 +54,8 @@ vetoEvent; } - const ParticleVector allphotons = applyProjection<IdentifiedFinalState>(event, "Photons").particles(); - ParticleVector photons; + const Particles allphotons = applyProjection<IdentifiedFinalState>(event, "Photons").particles(); + Particles photons; foreach (const Particle& photon, allphotons) { if (fabs(cos(photon.momentum().theta()))<0.95 && photon.momentum().E()>5.0*GeV) { photons.push_back(photon); Modified: trunk/src/Analyses/ALEPH_1996_S3486095.cc ============================================================================== --- trunk/src/Analyses/ALEPH_1996_S3486095.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ALEPH_1996_S3486095.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -242,7 +242,7 @@ //// Final state of unstable particles to get particle spectra const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); - for (ParticleVector::const_iterator p = ufs.particles().begin(); p != ufs.particles().end(); ++p) { + for (Particles::const_iterator p = ufs.particles().begin(); p != ufs.particles().end(); ++p) { const Vector3 mom3 = p->momentum().vector3(); int id = abs(p->pdgId()); const double mom = mom3.mod(); Modified: trunk/src/Analyses/ALICE_2012_I1181770.cc ============================================================================== --- trunk/src/Analyses/ALICE_2012_I1181770.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ALICE_2012_I1181770.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -43,12 +43,12 @@ _h_xsec_inel->fill(sqrtS()/GeV, weight); // Identify particles with most positive/most negative rapidities - const ParticleVector particlesByRap = cfs.particlesByRapidity(); + const Particles particlesByRap = cfs.particlesByRapidity(); const Particle pslowest = particlesByRap.front(); const Particle pfastest = particlesByRap.back(); // Find gap sizes - const ParticleVector particlesByEta = cfs.particlesByEta(); // sorted from minus to plus + const Particles particlesByEta = cfs.particlesByEta(); // sorted from minus to plus const size_t num_particles = particlesByEta.size(); vector<double> gaps; for (size_t ip = 1; ip < num_particles; ++ip) { Modified: trunk/src/Analyses/ARGUS_1993_S2653028.cc ============================================================================== --- trunk/src/Analyses/ARGUS_1993_S2653028.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ARGUS_1993_S2653028.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -24,7 +24,7 @@ const double weight = e.weight(); // Find the upsilons - ParticleVector upsilons; + Particles upsilons; // First in unstable final state const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); foreach (const Particle& p, ufs.particles()) { Modified: trunk/src/Analyses/ARGUS_1993_S2669951.cc ============================================================================== --- trunk/src/Analyses/ARGUS_1993_S2669951.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ARGUS_1993_S2669951.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -31,7 +31,7 @@ const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); // find the upsilons - ParticleVector upsilons; + Particles upsilons; // first in unstable final state foreach (const Particle& p, ufs.particles()) if (p.pdgId()==553 || p.pdgId()==100553 ) upsilons.push_back(p); @@ -83,7 +83,7 @@ _weightSum_Ups1 += weight; else _weightSum_Ups2 += weight; - ParticleVector unstable; + Particles unstable; // find the decay products we want findDecayProducts(ups.genParticle(), unstable); LorentzTransform cms_boost; @@ -195,7 +195,7 @@ void findDecayProducts(const GenParticle* p, - ParticleVector & unstable) { + Particles & unstable) { const GenVertex* dv = p->end_vertex(); /// @todo Use better looping for (GenVertex::particles_out_const_iterator pp = dv->particles_out_const_begin(); pp != dv->particles_out_const_end(); ++pp) { Modified: trunk/src/Analyses/ARGUS_1993_S2789213.cc ============================================================================== --- trunk/src/Analyses/ARGUS_1993_S2789213.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ARGUS_1993_S2789213.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -29,7 +29,7 @@ const double roots = sqrt(s); // Find the upsilons - ParticleVector upsilons; + Particles upsilons; // First in unstable final state const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); foreach (const Particle& p, ufs.particles()) @@ -95,7 +95,7 @@ _weightSum_Ups1 += weight; else _weightSum_Ups4 += weight; - ParticleVector unstable; + Particles unstable; // find the decay products we want findDecayProducts(ups.genParticle(),unstable); LorentzTransform cms_boost; @@ -264,7 +264,7 @@ //@} - void findDecayProducts(const GenParticle* p, ParticleVector& unstable) { + void findDecayProducts(const GenParticle* p, Particles& unstable) { const GenVertex* dv = p->end_vertex(); /// @todo Use better looping for (GenVertex::particles_out_const_iterator pp = dv->particles_out_const_begin(); pp != dv->particles_out_const_end(); ++pp) { Modified: trunk/src/Analyses/ATLAS_2010_S8894728.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2010_S8894728.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2010_S8894728.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -107,7 +107,7 @@ const ChargedFinalState& charged500 = applyProjection<ChargedFinalState>(event, "CFS500"); // Identify leading track and its phi and pT (this is the same for both the 100 MeV and 500 MeV track cuts) - ParticleVector particles500 = charged500.particlesByPt(); + Particles particles500 = charged500.particlesByPt(); Particle p_lead = particles500[0]; const double philead = p_lead.momentum().phi(); const double etalead = p_lead.momentum().eta(); Modified: trunk/src/Analyses/ATLAS_2010_S8914702.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2010_S8914702.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2010_S8914702.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -84,7 +84,7 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); + Particles photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); if (photons.size() != 1) { vetoEvent; } @@ -99,7 +99,7 @@ int eta_bin = getEtaBin(eta_P,false); - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); + Particles fs = applyProjection<FinalState>(event, "FS").particles(); FourMomentum mom_in_EtCone; foreach (const Particle& p, fs) { // check if it's in the cone of .4 Modified: trunk/src/Analyses/ATLAS_2010_S8919674.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2010_S8919674.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2010_S8919674.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -98,7 +98,7 @@ const double weight = event.weight(); const FinalState& elecs = applyProjection<FinalState>(event, "elecs"); - ParticleVector elec_neutrino=applyProjection<FinalState>(event, "elec_neutrino").particles(); + Particles elec_neutrino=applyProjection<FinalState>(event, "elec_neutrino").particles(); if (elecs.size()==1 && elec_neutrino.size()>0) { FourMomentum lepton=elecs.particles()[0].momentum(); foreach (const Particle& photon, @@ -131,7 +131,7 @@ } const FinalState& muons = applyProjection<FinalState>(event, "muons"); - ParticleVector muon_neutrino=applyProjection<FinalState>(event, "muon_neutrino").particles(); + Particles muon_neutrino=applyProjection<FinalState>(event, "muon_neutrino").particles(); if (muons.size()==1 && muon_neutrino.size()>0) { FourMomentum lepton=muons.particles()[0].momentum(); foreach (const Particle& photon, Modified: trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_CONF_2011_090.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -98,7 +98,7 @@ const double weight = event.weight(); - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -113,14 +113,14 @@ } } - ParticleVector candtemp_e = + Particles candtemp_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - ParticleVector candtemp_mu = + Particles candtemp_mu = applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt(); - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - ParticleVector cand_mu; - ParticleVector cand_e; + Particles cand_mu; + Particles cand_e; // pTcone around muon track @@ -163,7 +163,7 @@ } // only consider leptons far from jet - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool e_near_jet = false; foreach ( const Jet& jet, cand_jets_2 ) { @@ -186,7 +186,7 @@ } // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { @@ -240,7 +240,7 @@ } - ParticleVector lepton; + Particles lepton; if ( recon_mu.empty() && recon_e.empty() ) { MSG_DEBUG("No leptons"); vetoEvent; Modified: trunk/src/Analyses/ATLAS_2011_CONF_2011_098.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_CONF_2011_098.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_CONF_2011_098.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -99,11 +99,11 @@ } } - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - ParticleVector cand_mu = + Particles cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); //cerr << "cand_e.size(): " << cand_e.size() << " cand_mu.size(): " << cand_mu.size() << '\n'; @@ -126,7 +126,7 @@ } } - ParticleVector cand_lept; + Particles cand_lept; bool isolated_e; foreach ( const Particle & e, cand_e ) { @@ -153,7 +153,7 @@ // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2011_S8983313.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S8983313.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S8983313.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -95,7 +95,7 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -111,11 +111,11 @@ } } - ParticleVector cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - ParticleVector cand_mu; - ParticleVector chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { double pTinCone = -mu.momentum().pT(); @@ -144,7 +144,7 @@ } } - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool away = true; @@ -172,7 +172,7 @@ // pTmiss - ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { pTmiss -= p.momentum(); Modified: trunk/src/Analyses/ATLAS_2011_S8994773.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S8994773.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S8994773.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -51,7 +51,7 @@ const FinalState& chargedNeutral500 = applyProjection<FinalState>(event, "FS500"); // Identify leading object and its phi and pT - ParticleVector particles500 = chargedNeutral500.particlesByPt(); + Particles particles500 = chargedNeutral500.particlesByPt(); Particle p_lead = particles500[0]; const double philead = p_lead.momentum().phi(); const double etalead = p_lead.momentum().eta(); Modified: trunk/src/Analyses/ATLAS_2011_S9002537.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9002537.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9002537.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -45,7 +45,7 @@ applyProjection<ChargedFinalState>(event, "tracks"); if (muons.size()<1) vetoEvent; - ParticleVector selected_muons; + Particles selected_muons; foreach (Particle muon, muons.particles()) { FourMomentum testmom = muon.momentum(); double ptmu(testmom.pT()), ptsum(-ptmu), ratio(0.); Modified: trunk/src/Analyses/ATLAS_2011_S9019561.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9019561.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9019561.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -97,7 +97,7 @@ const double weight = event.weight(); - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -112,15 +112,15 @@ } } - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // charged particle for isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // apply muon isolation - ParticleVector cand_mu; + Particles cand_mu; // pTcone around muon track foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt() ) { @@ -148,7 +148,7 @@ } // Leptons far from jet - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { bool e_near_jet = false; foreach ( const Jet& jet, recon_jets ) { @@ -169,7 +169,7 @@ } } - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { bool mu_near_jet = false; foreach ( const Jet& jet, recon_jets ) { @@ -184,7 +184,7 @@ // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2011_S9041966.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9041966.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9041966.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -131,7 +131,7 @@ // debug - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -149,13 +149,13 @@ } - ParticleVector candtemp_e = + Particles candtemp_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - ParticleVector candtemp_mu = + Particles candtemp_mu = applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt(); - ParticleVector cand_mu; - ParticleVector cand_e; - ParticleVector vfs_particles + Particles cand_mu; + Particles cand_e; + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); @@ -257,7 +257,7 @@ p_j[0] = recon_jets[0].momentum(); p_j[1] = recon_jets[1].momentum(); - ParticleVector dilept_pair; + Particles dilept_pair; bool single_lept = false; if ( cand_mu.size() == 2 && cand_e.empty() ) { Modified: trunk/src/Analyses/ATLAS_2011_S9108483.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9108483.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9108483.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -87,7 +87,7 @@ // event weight const double weight = event.weight(); // get the charged final-state particles - ParticleVector charged = + Particles charged = applyProjection<VetoedFinalState>(event,"VFS").particles(); // need at least two candidates if(charged.size()<2) vetoEvent; Modified: trunk/src/Analyses/ATLAS_2011_S9120807.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9120807.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9120807.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -83,7 +83,7 @@ /// /// require at least 2 photons in final state /// - ParticleVector photons = applyProjection<IdentifiedFinalState>(event, "Photon").particlesByPt(); + Particles photons = applyProjection<IdentifiedFinalState>(event, "Photon").particlesByPt(); if (photons.size() < 2) { vetoEvent; } @@ -126,7 +126,7 @@ /// /// Loop over photons and fill vector of isolated ones /// - ParticleVector isolated_photons; + Particles isolated_photons; foreach (const Particle& photon, photons) { /// @@ -142,7 +142,7 @@ /// /// std EtCone - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); + Particles fs = applyProjection<FinalState>(event, "FS").particles(); FourMomentum mom_in_EtCone; foreach (const Particle& p, fs) { /// check if it's in the cone of .4 Modified: trunk/src/Analyses/ATLAS_2011_S9212183.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9212183.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9212183.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -87,13 +87,13 @@ } } - const ParticleVector cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); + const Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // Muon isolation not mentioned in hep-exp 1109.6572, unlike in 1102.5290, // but assumed to still be applicable - ParticleVector cand_mu; - const ParticleVector chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - const ParticleVector muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); + Particles cand_mu; + const Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); + const Particles muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); foreach (const Particle& mu, muons) { double pTinCone = -mu.momentum().pT(); foreach (const Particle& track, chg_tracks) { @@ -122,7 +122,7 @@ } - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool away = true; @@ -150,7 +150,7 @@ // pTmiss // Based on all candidate electrons, muons and jets, plus everything else with |eta| < 4.5 // i.e. everything in our projection "vfs" plus the jets with |eta| > 4.5 - ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { pTmiss -= p.momentum(); @@ -171,7 +171,7 @@ // the paper and the similar Rivet analysis ATLAS_2011_S8983313 // 'candidate' muons needed only 10 GeV, to cause a veto they need 20 GeV - ParticleVector veto_mu; + Particles veto_mu; foreach ( const Particle & mu, cand_mu ) { if ( mu.momentum().pT() >= 20.0*GeV ) veto_mu.push_back(mu); } Modified: trunk/src/Analyses/ATLAS_2011_S9212353.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9212353.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9212353.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -116,7 +116,7 @@ /// Perform the per-event analysis void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -131,14 +131,14 @@ } } - ParticleVector candtemp_e = + Particles candtemp_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - ParticleVector candtemp_mu = + Particles candtemp_mu = applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt(); - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - ParticleVector cand_mu; - ParticleVector cand_e; + Particles cand_mu; + Particles cand_e; // pTcone around muon track @@ -178,7 +178,7 @@ } // only consider leptons far from jet - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool e_near_jet = false; foreach ( const Jet& jet, recon_jets ) { @@ -201,7 +201,7 @@ } // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { @@ -225,7 +225,7 @@ vetoEvent; } - ParticleVector lepton; + Particles lepton; if ( recon_mu.empty() && recon_e.empty() ) { MSG_DEBUG("No leptons"); vetoEvent; Modified: trunk/src/Analyses/ATLAS_2011_S9225137.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9225137.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2011_S9225137.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -122,7 +122,7 @@ void analyze(const Event& event) { const double weight = event.weight(); // apply electron veto region - ParticleVector veto_e + Particles veto_e = applyProjection<IdentifiedFinalState>(event, "veto_elecs").particles(); if ( ! veto_e.empty() ) { MSG_DEBUG("electrons in veto region"); @@ -139,8 +139,8 @@ } // candidate muons - ParticleVector cand_mu; - ParticleVector chg_tracks = + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { @@ -155,7 +155,7 @@ // candidate electrons - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // resolve jet/lepton ambiguity @@ -179,7 +179,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { bool away = true; foreach ( const Jet& jet, cand_jets_2 ) { @@ -193,7 +193,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { bool away = true; foreach ( const Jet& jet, cand_jets_2 ) { @@ -207,7 +207,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_001.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_001.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_001.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -100,8 +100,8 @@ } // candidate muons - ParticleVector cand_mu; - ParticleVector chg_tracks = + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { @@ -115,7 +115,7 @@ } // candidate electrons - ParticleVector cand_e; + Particles cand_e; foreach ( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt() ) { double eta = e.momentum().eta(); @@ -147,7 +147,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector cand2_e; + Particles cand2_e; for(unsigned int ie=0;ie<cand_e.size();++ie) { const Particle & e = cand_e[ie]; // at least 0.4 from any jets @@ -179,7 +179,7 @@ if ( away ) cand2_e.push_back( e ); } // remove e+e- pairs with mass < 20. - ParticleVector recon_e; + Particles recon_e; for(unsigned int ie=0;ie<cand2_e.size();++ie) { bool pass = true; for(unsigned int ie2=0;ie2<cand2_e.size();++ie2) { @@ -194,7 +194,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector cand2_mu; + Particles cand2_mu; for(unsigned int imu=0;imu<cand_mu.size();++imu) { const Particle & mu = cand_mu[imu]; bool away = true; @@ -227,7 +227,7 @@ } // remove mu+mu- pairs with mass < 20. - ParticleVector recon_mu; + Particles recon_mu; for(unsigned int imu=0;imu<cand2_mu.size();++imu) { bool pass = true; for(unsigned int imu2=0;imu2<cand2_mu.size();++imu2) { @@ -242,7 +242,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_103.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -95,11 +95,11 @@ } // candidate muons - ParticleVector cand_mu = + Particles cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); // candidate electrons - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // resolve jet/lepton ambiguity @@ -118,7 +118,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -132,7 +132,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -146,7 +146,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_104.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -84,7 +84,7 @@ } // get the candidate "medium" leptons without isolation - ParticleVector cand_e; + Particles cand_e; foreach( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets @@ -98,7 +98,7 @@ } if ( ! e_near_jet ) cand_e.push_back(e); } - ParticleVector cand_mu; + Particles cand_mu; foreach( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets @@ -112,10 +112,10 @@ if ( ! mu_near_jet ) cand_mu.push_back(mu); } // apply the isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // pTcone around muon track (hard) - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { double pTinCone = -mu.momentum().pT(); if(-pTinCone<25.) continue; @@ -126,7 +126,7 @@ if ( pTinCone < 1.8*GeV ) recon_mu.push_back(mu); } // pTcone around electron track (hard) - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { double pTinCone = -e.momentum().pT(); if(-pTinCone<25.) continue; Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_105.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -92,7 +92,7 @@ } // electron candidates - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // Discard jets that overlap with electrons @@ -108,11 +108,11 @@ if ( away_from_e ) recon_jets.push_back( jet ); } // get the charged tracks for isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // Reconstructed electrons - ParticleVector recon_leptons; + Particles recon_leptons; foreach ( const Particle & e, cand_e ) { // check not near a jet bool e_near_jet = false; @@ -134,7 +134,7 @@ } // Reconstructed Muons - ParticleVector cand_mu = + Particles cand_mu = applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt(); foreach ( const Particle & mu, cand_mu ) { // check not near a jet @@ -157,7 +157,7 @@ } // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_109.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -101,12 +101,12 @@ } } - const ParticleVector cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); + const Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // Muon isolation not mentioned in hep-exp 1109.6572 but assumed to still be applicable - ParticleVector cand_mu; - const ParticleVector chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - const ParticleVector muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); + Particles cand_mu; + const Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); + const Particles muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); foreach (const Particle& mu, muons) { double pTinCone = -mu.momentum().pT(); foreach (const Particle& track, chg_tracks) { @@ -131,7 +131,7 @@ if ( away_from_e ) recon_jets.push_back( jet ); } - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool away = true; @@ -158,7 +158,7 @@ // pTmiss // Based on all candidate electrons, muons and jets, plus everything else with |eta| < 4.5 // i.e. everything in our projection "vfs" plus the jets with |eta| > 4.5 - ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { pTmiss -= p.momentum(); Modified: trunk/src/Analyses/ATLAS_2012_CONF_2012_153.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_CONF_2012_153.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_CONF_2012_153.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -109,13 +109,13 @@ } // candidate muons - ParticleVector cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); + Particles cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); // candidate electrons // Discard if two electrons are within R=0.1 - ParticleVector temp = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByE(); + Particles temp = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByE(); vector<bool> vetoed(temp.size(),false); - ParticleVector cand_e; + Particles cand_e; for (unsigned int ix=0; ix<temp.size(); ++ix) { if(vetoed[ix]) continue; for (unsigned int iy=ix+1; iy<temp.size(); ++iy) { @@ -144,7 +144,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector cand2_e; + Particles cand2_e; foreach (const Particle & e, cand_e) { // at least 0.4 from any jets bool away = true; @@ -160,7 +160,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector cand2_mu; + Particles cand2_mu; foreach(const Particle & mu, cand_mu ) { bool away = true; // at least 0.4 from any jets @@ -175,7 +175,7 @@ } // electron and muon more than 0.1 apart - ParticleVector cand3_e; + Particles cand3_e; foreach ( const Particle & e, cand2_e ) { bool away = true; foreach( const Particle & mu, cand2_mu ) { @@ -186,7 +186,7 @@ } if(away) cand3_e.push_back(e); } - ParticleVector cand3_mu; + Particles cand3_mu; foreach( const Particle & mu, cand2_mu ) { bool away = true; foreach ( const Particle & e, cand2_e ) { @@ -199,7 +199,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { @@ -208,9 +208,9 @@ double eTmiss = pTmiss.pT(); // apply electron isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - ParticleVector cand4_e; + Particles cand4_e; foreach ( const Particle & e, cand3_e ) { // charge isolation double pTinCone = -e.momentum().perp(); @@ -233,7 +233,7 @@ } // apply muon isolation - ParticleVector cand4_mu; + Particles cand4_mu; foreach ( const Particle & mu, cand3_mu ) { double pTinCone = -mu.momentum().perp(); foreach ( const Particle & track, chg_tracks ) { @@ -247,7 +247,7 @@ } // same SOSF pairs m>12. - ParticleVector recon_e; + Particles recon_e; foreach(const Particle & e, cand4_e) { bool veto=false; foreach(const Particle & e2, cand4_e) { @@ -258,7 +258,7 @@ } if(!veto) recon_e.push_back(e); } - ParticleVector recon_mu; + Particles recon_mu; foreach(const Particle & mu, cand4_mu) { bool veto=false; foreach(const Particle & mu2, cand4_mu) { Modified: trunk/src/Analyses/ATLAS_2012_I1082009.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1082009.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1082009.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -66,7 +66,7 @@ } // get the D* mesons const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(event, "UFS"); - ParticleVector Dstar; + Particles Dstar; foreach (const Particle& p, ufs.particles()) { const int id = abs(p.pdgId()); if(id==413) Dstar.push_back(p); Modified: trunk/src/Analyses/ATLAS_2012_I1083318.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1083318.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1083318.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -96,7 +96,7 @@ const double weight = event.weight(); const vector<ClusteredLepton>& leptons = applyProjection<LeptonClusters>(event, "leptons").clusteredLeptons(); - ParticleVector neutrinos = applyProjection<FinalState>(event, "neutrinos").particlesByPt(); + Particles neutrinos = applyProjection<FinalState>(event, "neutrinos").particlesByPt(); if (leptons.size()!=1 || (neutrinos.size()==0)) { vetoEvent; Modified: trunk/src/Analyses/ATLAS_2012_I1091481.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1091481.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1091481.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -58,7 +58,7 @@ // // -1 + 1/Nch * |sum_j^Nch exp[i*(xi eta_j - Phi_j)]|^2 // - double getSeta(const ParticleVector& part, double xi) { + double getSeta(const Particles& part, double xi) { std::complex<double> c_eta (0.0, 0.0); foreach (const Particle& p, part) { double eta = p.momentum().eta(); @@ -74,7 +74,7 @@ // S_E core for one event // // -1 + 1/Nch * |sum_j^Nch exp[i*(omega X_j - Phi_j)]|^2 - double getSE(const ParticleVector& part, double omega) { + double getSE(const Particles& part, double omega) { double Xj = 0.0; std::complex<double> c_E (0.0, 0.0); for (unsigned int i=0; i<part.size(); i++) { @@ -90,7 +90,7 @@ } // Convenient fill function - void fillS(Histo1DPtr h, const ParticleVector& part, double weight, bool SE=true) { + void fillS(Histo1DPtr h, const Particles& part, double weight, bool SE=true) { // Loop over bins, take bin centers as parameter values for (size_t i=0; i< h->numBins(); i++) { double x = h->bin(i).midpoint(); @@ -107,9 +107,9 @@ // Charged fs const ChargedFinalState& cfs100 = applyProjection<ChargedFinalState>(event, "CFS100"); - const ParticleVector part100 = cfs100.particlesByEta(); + const Particles part100 = cfs100.particlesByEta(); const ChargedFinalState& cfs500 = applyProjection<ChargedFinalState>(event, "CFS500"); - const ParticleVector& part500 = cfs500.particlesByEta(); + const Particles& part500 = cfs500.particlesByEta(); // Veto event if the most inclusive phase space has less than 10 particles and the max pT is > 10 GeV if (part100.size() < 11) vetoEvent; Modified: trunk/src/Analyses/ATLAS_2012_I1093738.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1093738.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1093738.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -220,7 +220,7 @@ // compute photon isolation // std EtCone - ParticleVector fs = applyProjection<FinalState>(event, "JetFS").particles(); + Particles fs = applyProjection<FinalState>(event, "JetFS").particles(); FourMomentum mom_in_EtCone; float iso_dR = 0.4; float cluster_eta_width = 0.25*7.0; Modified: trunk/src/Analyses/ATLAS_2012_I1094568.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1094568.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1094568.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -138,9 +138,9 @@ const double weight = event.weight(); /// Get the various sets of final state particles - const ParticleVector& elecFS = applyProjection<IdentifiedFinalState>(event, "ELEC_FS").particlesByPt(); - const ParticleVector& muonFS = applyProjection<IdentifiedFinalState>(event, "MUON_FS").particlesByPt(); - const ParticleVector& neutrinoFS = applyProjection<IdentifiedFinalState>(event, "NEUTRINO_FS").particlesByPt(); + const Particles& elecFS = applyProjection<IdentifiedFinalState>(event, "ELEC_FS").particlesByPt(); + const Particles& muonFS = applyProjection<IdentifiedFinalState>(event, "MUON_FS").particlesByPt(); + const Particles& neutrinoFS = applyProjection<IdentifiedFinalState>(event, "NEUTRINO_FS").particlesByPt(); // Get all jets with pT > 25 GeV const Jets& jets = applyProjection<FastJets>(event, "JETS").jetsByPt(25.0*GeV); Modified: trunk/src/Analyses/ATLAS_2012_I1095236.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1095236.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1095236.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -96,9 +96,9 @@ } } - const ParticleVector cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); + const Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); - const ParticleVector cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); + const Particles cand_mu = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); // Resolve jet-lepton overlap for jets with |eta| < 2.8 Jets recon_jets; foreach ( const Jet& jet, cand_jets ) { @@ -114,7 +114,7 @@ } // get the loose leptons used to define the 0 lepton channel - ParticleVector loose_e, loose_mu; + Particles loose_e, loose_mu; foreach ( const Particle & e, cand_e ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -136,8 +136,8 @@ if ( away ) loose_mu.push_back( mu ); } // tight leptons for the 1-lepton channel - ParticleVector tight_mu; - ParticleVector chg_tracks = + Particles tight_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, loose_mu) { if(mu.momentum().perp()<20.) continue; @@ -149,7 +149,7 @@ if ( pTinCone < 1.8*GeV ) tight_mu.push_back(mu); } - ParticleVector tight_e; + Particles tight_e; foreach ( const Particle & e, loose_e ) { if(e.momentum().perp()<25.) continue; double pTinCone = -e.momentum().perp(); @@ -163,7 +163,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_I1112263.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1112263.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1112263.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -94,8 +94,8 @@ } // candidate muons - ParticleVector cand_mu; - ParticleVector chg_tracks = + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { @@ -109,7 +109,7 @@ } // candidate electrons - ParticleVector cand_e; + Particles cand_e; foreach ( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt() ) { double eta = e.momentum().eta(); @@ -145,7 +145,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -167,7 +167,7 @@ recon_e.push_back( e ); } // only keep muons more than R=0.4 from jets - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -190,7 +190,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_I1117704.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1117704.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1117704.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -98,8 +98,8 @@ } // candidate muons - ParticleVector cand_mu; - ParticleVector chg_tracks = + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { @@ -113,7 +113,7 @@ } // candidate electrons - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // resolve jet/lepton ambiguity @@ -132,7 +132,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -146,7 +146,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { bool away = true; foreach ( const Jet& jet, recon_jets ) { @@ -160,7 +160,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_I1118269.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1118269.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1118269.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -22,7 +22,7 @@ void analyze(const Event& event) { double weight = event.weight(); - ParticleVector bhadrons; + Particles bhadrons; foreach (const GenParticle* p, particles(event.genEvent())) { if (!( PID::isHadron( p->pdg_id() ) && PID::hasBottom( p->pdg_id() )) ) continue; Modified: trunk/src/Analyses/ATLAS_2012_I1125575.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1125575.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1125575.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -132,7 +132,7 @@ lead_jet_pts[i] = all_jets[i]->at(0).momentum().pT(); // Loop over each of the charged particles - const ParticleVector& tracks = applyProjection<ChargedFinalState>(event, "TRACK_INPUT").particlesByPt(); + const Particles& tracks = applyProjection<ChargedFinalState>(event, "TRACK_INPUT").particlesByPt(); foreach(const Particle& t, tracks) { // Get the delta-phi between the track and the leading jet Modified: trunk/src/Analyses/ATLAS_2012_I1125961.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1125961.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1125961.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -95,12 +95,12 @@ } } - const ParticleVector cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); + const Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // Muon isolation not mentioned in hep-exp 1109.6572 but assumed to still be applicable - ParticleVector cand_mu; - const ParticleVector chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); - const ParticleVector muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); + Particles cand_mu; + const Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); + const Particles muons = applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt(); foreach (const Particle& mu, muons) { double pTinCone = -mu.momentum().pT(); foreach (const Particle& track, chg_tracks) { @@ -125,7 +125,7 @@ if ( away_from_e ) recon_jets.push_back( jet ); } - ParticleVector recon_e, recon_mu; + Particles recon_e, recon_mu; foreach ( const Particle & e, cand_e ) { bool away = true; @@ -152,7 +152,7 @@ // pTmiss // Based on all candidate electrons, muons and jets, plus everything else with |eta| < 4.5 // i.e. everything in our projection "vfs" plus the jets with |eta| > 4.5 - ParticleVector vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { pTmiss -= p.momentum(); Modified: trunk/src/Analyses/ATLAS_2012_I1126136.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1126136.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1126136.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -97,7 +97,7 @@ } // find the electrons - ParticleVector cand_e; + Particles cand_e; foreach( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets @@ -114,7 +114,7 @@ } // find the muons - ParticleVector cand_mu; + Particles cand_mu; foreach( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets Modified: trunk/src/Analyses/ATLAS_2012_I1180197.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1180197.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1180197.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -102,10 +102,10 @@ } } // charged tracks for isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // find the electrons - ParticleVector cand_soft_e,cand_hard_e; + Particles cand_soft_e,cand_hard_e; foreach( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt()) { double pT = e.momentum().perp(); @@ -127,7 +127,7 @@ // hard selection if(pT>10.) cand_hard_e.push_back(e); } - ParticleVector cand_soft_mu,cand_hard_mu; + Particles cand_soft_mu,cand_hard_mu; foreach( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt()) { double pT = mu.momentum().perp(); @@ -149,7 +149,7 @@ if(pT>10.) cand_hard_mu.push_back(mu); } // pTcone around muon track (hard) - ParticleVector recon_hard_mu; + Particles recon_hard_mu; foreach ( const Particle & mu, cand_hard_mu ) { double pTinCone = -mu.momentum().pT(); foreach ( const Particle & track, chg_tracks ) { @@ -159,7 +159,7 @@ if ( pTinCone < 1.8*GeV ) recon_hard_mu.push_back(mu); } // pTcone around muon track (soft) - ParticleVector recon_soft_mu; + Particles recon_soft_mu; foreach ( const Particle & mu, cand_soft_mu ) { double pTinCone = -mu.momentum().pT(); if(-pTinCone>20.) continue; @@ -170,7 +170,7 @@ if ( pTinCone < 1.8*GeV ) recon_soft_mu.push_back(mu); } // pTcone around electron track (hard) - ParticleVector recon_hard_e; + Particles recon_hard_e; foreach ( const Particle & e, cand_hard_e ) { double pTinCone = -e.momentum().pT(); foreach ( const Particle & track, chg_tracks ) { @@ -180,7 +180,7 @@ if ( pTinCone < 0.1 * e.momentum().pT() ) recon_hard_e.push_back(e); } // pTcone around electron track (soft) - ParticleVector recon_soft_e; + Particles recon_soft_e; foreach ( const Particle & e, cand_soft_e ) { double pTinCone = -e.momentum().pT(); if(-pTinCone>25.) continue; @@ -276,7 +276,7 @@ // multi lepton else if( recon_hard_e.size() + recon_hard_mu.size() >= 2 && njet >=2 ) { // get all the leptons and sort them by pT - ParticleVector leptons(recon_hard_e.begin(),recon_hard_e.end()); + Particles leptons(recon_hard_e.begin(),recon_hard_e.end()); leptons.insert(leptons.begin(),recon_hard_mu.begin(),recon_hard_mu.end()); std::sort(leptons.begin(),leptons.end(),cmpParticleByPt); double m_eff(0.0); Modified: trunk/src/Analyses/ATLAS_2012_I1183818.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1183818.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1183818.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -79,7 +79,7 @@ const FinalState& cnfs = applyProjection<FinalState>(event, "FS"); - ParticleVector particles; + Particles particles; foreach( const Particle& p, cnfs.particles() ) { // enforce truth selection representing detected particle sensitivity double pp = p.momentum().p().mod(); Modified: trunk/src/Analyses/ATLAS_2012_I1186556.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1186556.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1186556.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -86,10 +86,10 @@ } } // charged tracks for isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // find the electrons - ParticleVector cand_e; + Particles cand_e; foreach( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets @@ -104,7 +104,7 @@ if ( e_near_jet ) continue; cand_e.push_back(e); } - ParticleVector cand_mu; + Particles cand_mu; foreach( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt()) { // remove any leptons within 0.4 of any candidate jets @@ -119,7 +119,7 @@ cand_mu.push_back(mu); } // pTcone around muon track - ParticleVector recon_mu; + Particles recon_mu; foreach ( const Particle & mu, cand_mu ) { double pTinCone = -mu.momentum().pT(); foreach ( const Particle & track, chg_tracks ) { @@ -129,7 +129,7 @@ if ( pTinCone < 1.8*GeV ) recon_mu.push_back(mu); } // pTcone around electron track - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { double pTinCone = -e.momentum().pT(); foreach ( const Particle & track, chg_tracks ) { @@ -162,7 +162,7 @@ } // put leptons into 1 vector and order by pT - ParticleVector leptons(recon_e.begin(),recon_e.end()); + Particles leptons(recon_e.begin(),recon_e.end()); leptons.insert(leptons.begin(),recon_mu.begin(),recon_mu.end()); sort(leptons.begin(),leptons.end(),cmpParticleByPt); Modified: trunk/src/Analyses/ATLAS_2012_I1190891.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I1190891.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I1190891.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -84,8 +84,8 @@ } // candidate muons - ParticleVector cand_mu; - ParticleVector chg_tracks = + Particles cand_mu; + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); foreach ( const Particle & mu, applyProjection<IdentifiedFinalState>(event, "muons").particlesByPt() ) { @@ -99,7 +99,7 @@ } // candidate electrons - ParticleVector cand_e; + Particles cand_e; foreach ( const Particle & e, applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt() ) { double pTinCone = -e.momentum().perp(); @@ -127,7 +127,7 @@ } // only keep electrons more than R=0.4 from jets - ParticleVector cand2_e; + Particles cand2_e; for(unsigned int ie=0;ie<cand_e.size();++ie) { const Particle & e = cand_e[ie]; // at least 0.4 from any jets @@ -162,7 +162,7 @@ } // remove e+e- pairs with mass < 20. - ParticleVector recon_e; + Particles recon_e; for(unsigned int ie=0;ie<cand2_e.size();++ie) { bool pass = true; for(unsigned int ie2=0;ie2<cand2_e.size();++ie2) { @@ -177,7 +177,7 @@ } // only keep muons more than R=0.4 from jets - ParticleVector cand2_mu; + Particles cand2_mu; for(unsigned int imu=0;imu<cand_mu.size();++imu) { const Particle & mu = cand_mu[imu]; bool away = true; @@ -202,7 +202,7 @@ } // remove mu+mu- pairs with mass < 20. - ParticleVector recon_mu; + Particles recon_mu; for(unsigned int imu=0;imu<cand2_mu.size();++imu) { bool pass = true; for(unsigned int imu2=0;imu2<cand2_mu.size();++imu2) { @@ -217,7 +217,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2012_I943401.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I943401.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I943401.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -130,7 +130,7 @@ } // electron candidates - ParticleVector cand_e = + Particles cand_e = applyProjection<IdentifiedFinalState>(event, "elecs").particlesByPt(); // Discard jets that overlap with electrons @@ -146,11 +146,11 @@ if ( away_from_e ) recon_jets.push_back( jet ); } // get the charged tracks for isolation - ParticleVector chg_tracks = + Particles chg_tracks = applyProjection<ChargedFinalState>(event, "cfs").particles(); // Reconstructed electrons - ParticleVector recon_e; + Particles recon_e; foreach ( const Particle & e, cand_e ) { // check not near a jet bool e_near_jet = false; @@ -172,8 +172,8 @@ } // Reconstructed Muons - ParticleVector recon_mu; - ParticleVector cand_mu = + Particles recon_mu; + Particles cand_mu = applyProjection<IdentifiedFinalState>(event,"muons").particlesByPt(); foreach ( const Particle & mu, cand_mu ) { // check not near a jet @@ -196,7 +196,7 @@ } // pTmiss - ParticleVector vfs_particles + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { @@ -224,7 +224,7 @@ if ( recon_mu.size() + recon_e.size() != 2) vetoEvent; // two electrons highest pT > 25 - ParticleVector recon_leptons; + Particles recon_leptons; if(recon_e.size()==2&&recon_e[0].momentum().perp()>25.) { recon_leptons = recon_e; } Modified: trunk/src/Analyses/ATLAS_2012_I946427.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2012_I946427.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2012_I946427.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -63,15 +63,15 @@ const double weight = event.weight(); // require at least 2 photons in final state - ParticleVector photons = + Particles photons = applyProjection<IdentifiedFinalState>(event, "Photon").particlesByPt(); if (photons.size() < 2) { vetoEvent; } // Loop over photons and fill vector of isolated ones - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); - ParticleVector isolated_photons; + Particles fs = applyProjection<FinalState>(event, "FS").particles(); + Particles isolated_photons; foreach (const Particle& photon, photons) { // remove photons in crack double eta_P = photon.momentum().eta(); @@ -99,7 +99,7 @@ } // pTmiss - ParticleVector vfs_particles = + Particles vfs_particles = applyProjection<VisibleFinalState>(event, "vfs").particles(); FourMomentum pTmiss; foreach ( const Particle & p, vfs_particles ) { Modified: trunk/src/Analyses/ATLAS_2013_I1217867.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2013_I1217867.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/ATLAS_2013_I1217867.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -100,7 +100,7 @@ vetoEvent; } - const ParticleVector& neutrinos = applyProjection<FinalState>(e, "neutrinos").particlesByPt(); + const Particles& neutrinos = applyProjection<FinalState>(e, "neutrinos").particlesByPt(); if (neutrinos.size() < 1) vetoEvent; FourMomentum neutrino = neutrinos[0].momentum(); Modified: trunk/src/Analyses/BABAR_2003_I593379.cc ============================================================================== --- trunk/src/Analyses/BABAR_2003_I593379.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/BABAR_2003_I593379.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -23,7 +23,7 @@ const double weight = e.weight(); // Find the charmonia - ParticleVector upsilons; + Particles upsilons; // First in unstable final state const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); foreach (const Particle& p, ufs.particles()) Modified: trunk/src/Analyses/BABAR_2007_S7266081.cc ============================================================================== --- trunk/src/Analyses/BABAR_2007_S7266081.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/BABAR_2007_S7266081.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -23,12 +23,12 @@ void analyze(const Event& e) { // Find the taus - ParticleVector taus; + Particles taus; const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); foreach (const Particle& p, ufs.particles()) { if(abs(p.pdgId())!=15) continue; _weight_total += 1.; - ParticleVector pip,pim,Kp,Km; + Particles pip,pim,Kp,Km; unsigned int nstable = 0.; // get the boost to the rest frame LorentzTransform cms_boost; @@ -158,8 +158,8 @@ void findDecayProducts(const GenParticle* p, unsigned int & nstable, - ParticleVector& pip, ParticleVector& pim, - ParticleVector& Kp, ParticleVector& Km) { + Particles& pip, Particles& pim, + Particles& Kp, Particles& Km) { const GenVertex* dv = p->end_vertex(); /// @todo Use better looping for (GenVertex::particles_out_const_iterator pp = dv->particles_out_const_begin(); pp != dv->particles_out_const_end(); ++pp) { Modified: trunk/src/Analyses/BELLE_2001_S4598261.cc ============================================================================== --- trunk/src/Analyses/BELLE_2001_S4598261.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/BELLE_2001_S4598261.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -24,7 +24,7 @@ // find the upsilons - ParticleVector upsilons; + Particles upsilons; // first in unstable final state const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); foreach (const Particle& p, ufs.particles()) Modified: trunk/src/Analyses/CDF_1993_S2742446.cc ============================================================================== --- trunk/src/Analyses/CDF_1993_S2742446.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_1993_S2742446.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -46,7 +46,7 @@ const double weight = event.weight(); - ParticleVector photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); + Particles photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); if (photons.size()!=1 || photons[0].momentum().pT()>45.0*GeV) { vetoEvent; } Modified: trunk/src/Analyses/CDF_2004_S5839831.cc ============================================================================== --- trunk/src/Analyses/CDF_2004_S5839831.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2004_S5839831.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -46,7 +46,7 @@ /// @endcond ConesInfo _calcTransCones(const double etaLead, const double phiLead, - const ParticleVector& tracks) { + const Particles& tracks) { const double phiTransPlus = mapAngle0To2Pi(phiLead + PI/2.0); const double phiTransMinus = mapAngle0To2Pi(phiLead - PI/2.0); MSG_DEBUG("phi_lead = " << phiLead @@ -89,7 +89,7 @@ ConesInfo _calcTransCones(const FourMomentum& leadvec, - const ParticleVector& tracks) { + const Particles& tracks) { const double etaLead = leadvec.pseudorapidity(); const double phiLead = leadvec.azimuthalAngle(); return _calcTransCones(etaLead, phiLead, tracks); @@ -173,7 +173,7 @@ << " not in |eta| < 0.5 & pT > 15 GeV"); } else { // Multiplicity & pT distributions for sqrt(s) = 630 GeV, 1800 GeV - const ParticleVector tracks = applyProjection<FinalState>(event, "TrackFS").particles(); + const Particles tracks = applyProjection<FinalState>(event, "TrackFS").particles(); const ConesInfo cones = _calcTransCones(leadingjet.momentum(), tracks); if (fuzzyEquals(sqrtS/GeV, 630)) { _pt90Max630->fill(ETlead/GeV, cones.ptMax/GeV, weight); @@ -210,7 +210,7 @@ // Fill min bias total track multiplicity histos { MSG_DEBUG("Running min bias multiplicity analysis"); - const ParticleVector mbtracks = applyProjection<FinalState>(event, "MBFS").particles(); + const Particles mbtracks = applyProjection<FinalState>(event, "MBFS").particles(); if (fuzzyEquals(sqrtS/GeV, 1800)) { _numTracksDbn1800MB->fill(mbtracks.size(), weight); } else if (fuzzyEquals(sqrtS/GeV, 630)) { @@ -237,7 +237,7 @@ // the removed jets must have Et > 5 GeV. { MSG_DEBUG("Running Swiss Cheese analysis"); - const ParticleVector cheesetracks = applyProjection<FinalState>(event, "CheeseFS").particles(); + const Particles cheesetracks = applyProjection<FinalState>(event, "CheeseFS").particles(); vector<Jet> cheesejets = applyProjection<JetAlg>(event, "Jets").jetsByE(); if (cheesejets.empty()) { MSG_DEBUG("No 'cheese' jets found in event"); Modified: trunk/src/Analyses/CDF_2005_S6080774.cc ============================================================================== --- trunk/src/Analyses/CDF_2005_S6080774.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2005_S6080774.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -40,15 +40,15 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector photons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); + Particles photons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); if (photons.size() < 2 || (photons[0].momentum().pT() < 14.0*GeV)) { vetoEvent; } // Isolate photons with ET_sum in cone - ParticleVector isolated_photons; - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); + Particles isolated_photons; + Particles fs = applyProjection<FinalState>(event, "FS").particles(); foreach (const Particle& photon, photons) { FourMomentum mom_in_cone; double eta_P = photon.momentum().eta(); Modified: trunk/src/Analyses/CDF_2006_S6653332.cc ============================================================================== --- trunk/src/Analyses/CDF_2006_S6653332.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2006_S6653332.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -64,7 +64,7 @@ // Check we have an l+l- pair that passes the kinematic cuts // Get the Z decay products (mu+mu- or e+e- pair) const InvMassFinalState& invMassFinalState = applyProjection<InvMassFinalState>(event, "INVFS"); - const ParticleVector& ZDecayProducts = invMassFinalState.particles(); + const Particles& ZDecayProducts = invMassFinalState.particles(); // Make sure we have at least 2 Z decay products (mumu or ee) if (ZDecayProducts.size() < 2) vetoEvent; @@ -89,7 +89,7 @@ // Put all b-quarks in a vector /// @todo Use jet contents rather than accessing quarks directly - ParticleVector bquarks; + Particles bquarks; /// @todo Use nicer looping for (GenEvent::particle_const_iterator p = event.genEvent()->particles_begin(); p != event.genEvent()->particles_end(); ++p) { if ( fabs((*p)->pdg_id()) == BQUARK ) { Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_NOTE_9351.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -89,7 +89,7 @@ const double weight = e.weight(); // Get the leptons - const ParticleVector& leptons = applyProjection<ChargedLeptons>(e, "CL").chargedLeptons(); + const Particles& leptons = applyProjection<ChargedLeptons>(e, "CL").chargedLeptons(); // We want exactly two leptons of the same flavour. MSG_DEBUG("lepton multiplicity = " << leptons.size()); @@ -112,7 +112,7 @@ const double phiZ = azimuthalAngle(dilepton); const double pTZ = pT(dilepton); /// @todo Replace with foreach - for (ParticleVector::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { + for (Particles::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { // Don't use the leptons /// @todo Replace with PID::isLepton if (abs(p->pdgId()) < 20) continue; Modified: trunk/src/Analyses/CDF_2008_S7540469.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7540469.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2008_S7540469.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -56,7 +56,7 @@ // Find the Z candidates const FinalState & electronfs = applyProjection<FinalState>(event, "LeadingElectrons"); std::vector<std::pair<Particle, Particle> > Z_candidates; - ParticleVector all_els=electronfs.particles(); + Particles all_els=electronfs.particles(); for (size_t i=0; i<all_els.size(); ++i) { for (size_t j=i+1; j<all_els.size(); ++j) { bool candidate=true; @@ -89,7 +89,7 @@ // Now build the jets on a FS without the electrons from the Z // (including their QED radiation) - ParticleVector jetparts; + Particles jetparts; foreach (const Particle& p, fs.particles()) { bool copy = true; if (p.pdgId() == PHOTON) { Modified: trunk/src/Analyses/CDF_2008_S7541902.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7541902.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2008_S7541902.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -67,7 +67,7 @@ void analyze(const Event& event) { // Get the W decay products (electron and neutrino) const InvMassFinalState& invMassFinalState = applyProjection<InvMassFinalState>(event, "INVFS"); - const ParticleVector& wDecayProducts = invMassFinalState.particles(); + const Particles& wDecayProducts = invMassFinalState.particles(); FourMomentum electronP, neutrinoP; bool gotElectron(false), gotNeutrino(false); Modified: trunk/src/Analyses/CDF_2008_S8095620.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S8095620.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2008_S8095620.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -61,7 +61,7 @@ // Check we have an l+l- pair that passes the kinematic cuts // Get the Z decay products (mu+mu- or e+e- pair) const InvMassFinalState& invMassFinalState = applyProjection<InvMassFinalState>(event, "INVFS"); - const ParticleVector& ZDecayProducts = invMassFinalState.particles(); + const Particles& ZDecayProducts = invMassFinalState.particles(); // make sure we have 2 Z decay products (mumu or ee) if (ZDecayProducts.size() < 2) vetoEvent; @@ -90,7 +90,7 @@ FourMomentum Zmom = ZDecayProducts[0].momentum() + ZDecayProducts[1].momentum(); // Put all b-quarks in a vector - ParticleVector bquarks; + Particles bquarks; foreach (const GenParticle* p, particles(event.genEvent())) { if (fabs(p->pdg_id()) == BQUARK) { bquarks += Particle(*p); Modified: trunk/src/Analyses/CDF_2009_S8436959.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_S8436959.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2009_S8436959.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -46,8 +46,8 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); - ParticleVector photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); + Particles fs = applyProjection<FinalState>(event, "FS").particles(); + Particles photons = applyProjection<LeadingParticlesFinalState>(event, "LeadingPhoton").particles(); if (photons.size()!=1) { vetoEvent; } Modified: trunk/src/Analyses/CDF_2010_S8591881_DY.cc ============================================================================== --- trunk/src/Analyses/CDF_2010_S8591881_DY.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2010_S8591881_DY.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -83,7 +83,7 @@ const double weight = e.weight(); // Get the leptons - const ParticleVector& leptons = applyProjection<ChargedLeptons>(e, "CL").chargedLeptons(); + const Particles& leptons = applyProjection<ChargedLeptons>(e, "CL").chargedLeptons(); // We want exactly two leptons of the same flavour. MSG_DEBUG("lepton multiplicity = " << leptons.size()); @@ -106,7 +106,7 @@ const double phiZ = azimuthalAngle(dilepton); const double pTZ = pT(dilepton); /// @todo Replace with foreach - for (ParticleVector::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { + for (Particles::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { // Don't use the leptons /// @todo Replace with PID::isLepton if (abs(p->pdgId()) < 20) continue; Modified: trunk/src/Analyses/CDF_2012_NOTE10874.cc ============================================================================== --- trunk/src/Analyses/CDF_2012_NOTE10874.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CDF_2012_NOTE10874.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -51,7 +51,7 @@ vetoEvent; } - ParticleVector particles = cfs.particlesByPt(); + Particles particles = cfs.particlesByPt(); Particle p_lead = particles[0]; const double philead = p_lead.momentum().phi(); const double pTlead = p_lead.momentum().pT(); Modified: trunk/src/Analyses/CMS_2011_I954992.cc ============================================================================== --- trunk/src/Analyses/CMS_2011_I954992.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CMS_2011_I954992.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -37,7 +37,7 @@ const ChargedFinalState& cfs = applyProjection<ChargedFinalState>(event, "CFS"); if (cfs.size() != 2) vetoEvent; // no other charged particles in 2.4 - const ParticleVector& muonFS = applyProjection<IdentifiedFinalState>(event, "MUON_FS").particles(); + const Particles& muonFS = applyProjection<IdentifiedFinalState>(event, "MUON_FS").particles(); if(muonFS.size() != 2) vetoEvent; if(PID::charge(muonFS[0]) != PID::charge(muonFS[1])) { Modified: trunk/src/Analyses/CMS_2011_S8941262.cc ============================================================================== --- trunk/src/Analyses/CMS_2011_S8941262.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CMS_2011_S8941262.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -41,7 +41,7 @@ nbtot += weight; // Event must contain a muon - ParticleVector muons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); + Particles muons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); if (muons.size() < 1) vetoEvent; nbmutot += weight; Modified: trunk/src/Analyses/CMS_2011_S9120041.cc ============================================================================== --- trunk/src/Analyses/CMS_2011_S9120041.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CMS_2011_S9120041.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -71,7 +71,7 @@ const double philead = p_lead.phi(); const double pTlead = p_lead.pT(); - ParticleVector particles = applyProjection<ChargedFinalState>(event, "CFS").particlesByPt(); + Particles particles = applyProjection<ChargedFinalState>(event, "CFS").particlesByPt(); int nTransverse = 0; double ptSumTransverse = 0.; Modified: trunk/src/Analyses/CMS_2012_I1107658.cc ============================================================================== --- trunk/src/Analyses/CMS_2012_I1107658.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CMS_2012_I1107658.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -62,7 +62,7 @@ double Zphi = zfinder.bosons()[0].momentum().phi(); double Zmass = zfinder.bosons()[0].momentum().mass()/GeV; - ParticleVector particles = applyProjection<VetoedFinalState>(event, "nonmuons").particles(); + Particles particles = applyProjection<VetoedFinalState>(event, "nonmuons").particles(); int nTowards = 0; int nTransverse = 0; Modified: trunk/src/Analyses/CMS_2012_PAS_FWD_11_003.cc ============================================================================== --- trunk/src/Analyses/CMS_2012_PAS_FWD_11_003.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/CMS_2012_PAS_FWD_11_003.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -74,7 +74,7 @@ // ====================== Minimum Bias selection const FinalState& sfsv = applyProjection<FinalState>(event, "sfsv"); - ParticleVector parts = sfsv.particlesByRapidity(); + Particles parts = sfsv.particlesByRapidity(); if (parts.empty()) vetoEvent; // find dymax Modified: trunk/src/Analyses/D0_2001_S4674421.cc ============================================================================== --- trunk/src/Analyses/D0_2001_S4674421.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/D0_2001_S4674421.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -73,7 +73,7 @@ // Fill Z pT distributions double deltaM2=1e30,mass2(0.); double pT=-1.; - const ParticleVector& Zdaughters = eeFS.particles(); + const Particles& Zdaughters = eeFS.particles(); for(unsigned int ix=0;ix<Zdaughters.size();++ix) { for(unsigned int iy=ix+1;iy<Zdaughters.size();++iy) { if(Zdaughters[ix].pdgId()!=-Zdaughters[iy].pdgId()) continue; @@ -102,7 +102,7 @@ double deltaM2=1e30; double pT=-1.; for(unsigned int iw=0;iw<2;++iw) { - ParticleVector Wdaughters; + Particles Wdaughters; Wdaughters = iw==0 ? enuFS.particles() : enubFS.particles(); for(unsigned int ix=0;ix<Wdaughters.size();++ix) { for(unsigned int iy=ix+1;iy<Wdaughters.size();++iy) { Modified: trunk/src/Analyses/D0_2007_S7075677.cc ============================================================================== --- trunk/src/Analyses/D0_2007_S7075677.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/D0_2007_S7075677.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -42,7 +42,7 @@ const ZFinder& zfinder = applyProjection<ZFinder>(e, "ZFinder"); if (zfinder.bosons().size() == 1) { - const ParticleVector& el(zfinder.constituents()); + const Particles& el(zfinder.constituents()); if (el[0].momentum().pT() > 25.0*GeV || el[1].momentum().pT() > 25.0*GeV) { double yZ = fabs(zfinder.bosons()[0].momentum().rapidity()); _h_yZ->fill(yZ, weight); Modified: trunk/src/Analyses/D0_2010_S8570965.cc ============================================================================== --- trunk/src/Analyses/D0_2010_S8570965.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/D0_2010_S8570965.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -54,15 +54,15 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector photons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); + Particles photons = applyProjection<IdentifiedFinalState>(event, "IFS").particlesByPt(); if (photons.size() < 2 || (photons[0].momentum().pT() < 21.0*GeV)) { vetoEvent; } // Isolate photons with ET_sum in cone - ParticleVector isolated_photons; - ParticleVector fs = applyProjection<FinalState>(event, "FS").particles(); + Particles isolated_photons; + Particles fs = applyProjection<FinalState>(event, "FS").particles(); foreach (const Particle& photon, photons) { double eta_P = photon.momentum().eta(); double phi_P = photon.momentum().phi(); Modified: trunk/src/Analyses/D0_2010_S8821313.cc ============================================================================== --- trunk/src/Analyses/D0_2010_S8821313.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/D0_2010_S8821313.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -61,7 +61,7 @@ const ZFinder& zfinder_ee = applyProjection<ZFinder>(event, "zfinder_ee"); if (zfinder_ee.bosons().size()==1) { - ParticleVector ee=zfinder_ee.constituents(); + Particles ee=zfinder_ee.constituents(); std::sort(ee.begin(), ee.end(), cmpParticleByPt); FourMomentum eminus=PID::threeCharge(ee[0].pdgId())<0.0?ee[0].momentum():ee[1].momentum(); FourMomentum eplus=PID::threeCharge(ee[0].pdgId())<0.0?ee[1].momentum():ee[0].momentum(); @@ -77,7 +77,7 @@ const ZFinder& zfinder_mm = applyProjection<ZFinder>(event, "zfinder_mm"); if (zfinder_mm.bosons().size()==1) { - ParticleVector mm=zfinder_mm.constituents(); + Particles mm=zfinder_mm.constituents(); std::sort(mm.begin(), mm.end(), cmpParticleByPt); FourMomentum mminus=PID::threeCharge(mm[0].pdgId())<0.0?mm[0].momentum():mm[1].momentum(); FourMomentum mplus=PID::threeCharge(mm[0].pdgId())<0.0?mm[1].momentum():mm[0].momentum(); Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc ============================================================================== --- trunk/src/Analyses/DELPHI_1996_S3430090.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/DELPHI_1996_S3430090.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -259,8 +259,8 @@ // (A)EEC // Need iterators since second loop starts at current outer loop iterator, i.e. no "foreach" here! - for (ParticleVector::const_iterator p_i = fs.particles().begin(); p_i != fs.particles().end(); ++p_i) { - for (ParticleVector::const_iterator p_j = p_i; p_j != fs.particles().end(); ++p_j) { + for (Particles::const_iterator p_i = fs.particles().begin(); p_i != fs.particles().end(); ++p_i) { + for (Particles::const_iterator p_j = p_i; p_j != fs.particles().end(); ++p_j) { if (p_i == p_j) continue; const Vector3 mom3_i = p_i->momentum().vector3(); const Vector3 mom3_j = p_j->momentum().vector3(); Modified: trunk/src/Analyses/H1_1994_S2919893.cc ============================================================================== --- trunk/src/Analyses/H1_1994_S2919893.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/H1_1994_S2919893.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -50,7 +50,7 @@ double thel = leptonMom.angle(dk.beamHadron().momentum())/degree; // Extract the particles other than the lepton - ParticleVector particles; + Particles particles; particles.reserve(fs.particles().size()); const GenParticle* dislepGP = dl.out().genParticle(); foreach (const Particle& p, fs.particles()) { Modified: trunk/src/Analyses/H1_2000_S4129130.cc ============================================================================== --- trunk/src/Analyses/H1_2000_S4129130.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/H1_2000_S4129130.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -43,7 +43,7 @@ double thel = 180.-leptonMom.angle(dl.in().momentum())/degree; // Extract the particles other than the lepton - ParticleVector particles; + Particles particles; particles.reserve(fs.particles().size()); const GenParticle* dislepGP = dl.out().genParticle(); foreach (const Particle& p, fs.particles()) { Modified: trunk/src/Analyses/LHCB_2010_I867355.cc ============================================================================== --- trunk/src/Analyses/LHCB_2010_I867355.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/LHCB_2010_I867355.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -28,7 +28,7 @@ void analyze(const Event& event) { double weight = event.weight(); - ParticleVector bhadrons; + Particles bhadrons; foreach (const GenParticle* p, particles(event.genEvent())) { if (!( PID::isHadron( p->pdg_id() ) && PID::hasBottom( p->pdg_id() )) ) continue; Modified: trunk/src/Analyses/MC_DIPHOTON.cc ============================================================================== --- trunk/src/Analyses/MC_DIPHOTON.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_DIPHOTON.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -40,15 +40,15 @@ void analyze(const Event& event) { const double weight = event.weight(); - ParticleVector photons = applyProjection<IdentifiedFinalState>(event, "IFS").particles(); + Particles photons = applyProjection<IdentifiedFinalState>(event, "IFS").particles(); if (photons.size() < 2) { vetoEvent; } // Isolate photons with ET_sum in cone - ParticleVector isolated_photons; - ParticleVector fs = applyProjection<FinalState>(event, "FS").particlesByPt(); + Particles isolated_photons; + Particles fs = applyProjection<FinalState>(event, "FS").particlesByPt(); foreach (const Particle& photon, photons) { FourMomentum mom_in_cone; double eta_P = photon.momentum().eta(); Modified: trunk/src/Analyses/MC_PHOTONINC.cc ============================================================================== --- trunk/src/Analyses/MC_PHOTONINC.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_PHOTONINC.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -46,7 +46,7 @@ /// Do the analysis void analyze(const Event& e) { // Get the photon - const ParticleVector photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); + const Particles photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); if (photons.size() != 1) { vetoEvent; } Modified: trunk/src/Analyses/MC_PHOTONJETS.cc ============================================================================== --- trunk/src/Analyses/MC_PHOTONJETS.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_PHOTONJETS.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -52,7 +52,7 @@ void analyze(const Event& e) { // Get the photon /// @todo share IsolatedPhoton projection between all MC_*PHOTON* analyses - const ParticleVector photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); + const Particles photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); if (photons.size() != 1) { vetoEvent; } Modified: trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc ============================================================================== --- trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_PHOTONKTSPLITTINGS.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -47,7 +47,7 @@ /// Do the analysis void analyze(const Event& e) { // Get the photon - const ParticleVector photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); + const Particles photons = applyProjection<FinalState>(e, "LeadingPhoton").particles(); if (photons.size() != 1) { vetoEvent; } Modified: trunk/src/Analyses/MC_PHOTONS.cc ============================================================================== --- trunk/src/Analyses/MC_PHOTONS.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_PHOTONS.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -56,9 +56,9 @@ const double weight = event.weight(); /// Get photons and leptons - const ParticleVector& photons = applyProjection<FinalState>(event, "gammaFS").particles(); + const Particles& photons = applyProjection<FinalState>(event, "gammaFS").particles(); MSG_DEBUG("Photon multiplicity = " << photons.size()); - const ParticleVector& leptons = applyProjection<FinalState>(event, "lFS").particles(); + const Particles& leptons = applyProjection<FinalState>(event, "lFS").particles(); MSG_DEBUG("Photon multiplicity = " << leptons.size()); // Initialise a map of sumPtgamma for each lepton Modified: trunk/src/Analyses/MC_SUSY.cc ============================================================================== --- trunk/src/Analyses/MC_SUSY.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_SUSY.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -175,7 +175,7 @@ // Fill final state non-isolated photon histos const FinalState& allphotonfs = applyProjection<FinalState>(evt, "AllPhotons"); _hist_n_gamma->fill(allphotonfs.size(), weight); - ParticleVector isolatedphotons; + Particles isolatedphotons; foreach (const Particle& ph, allphotonfs.particles()) { const FourMomentum& p = ph.momentum(); _hist_phi_gamma->fill(mapAngleMPiToPi(p.phi()), weight); Modified: trunk/src/Analyses/MC_VH2BB.cc ============================================================================== --- trunk/src/Analyses/MC_VH2BB.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/MC_VH2BB.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -132,7 +132,7 @@ Jets jets = applyProjection<FastJets>(event, "AntiKT04").jetsByPt(JETPTCUT); - ParticleVector vectorBosons = zeefinder.bosons(); + Particles vectorBosons = zeefinder.bosons(); /// @todo Don't we have a neater vector concatenation? vectorBosons.insert(vectorBosons.end(), zmmfinder.bosons().begin(), zmmfinder.bosons().end()); vectorBosons.insert(vectorBosons.end(), wefinder.bosons().begin(), wefinder.bosons().end()); Modified: trunk/src/Analyses/OPAL_1993_S2692198.cc ============================================================================== --- trunk/src/Analyses/OPAL_1993_S2692198.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/OPAL_1993_S2692198.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -41,8 +41,8 @@ const double weight = e.weight(); // extract the photons - ParticleVector photons; - ParticleVector nonPhotons; + Particles photons; + Particles nonPhotons; FourMomentum ptotal; const FinalState& fs = applyProjection<FinalState>(e, "FS"); foreach (const Particle& p, fs.particles()) { Modified: trunk/src/Analyses/SLD_1999_S3743934.cc ============================================================================== --- trunk/src/Analyses/SLD_1999_S3743934.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/SLD_1999_S3743934.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -54,7 +54,7 @@ // If we only have two quarks (qqbar), just take the flavour. // If we have more than two quarks, look for the highest energetic q-qbar pair. - ParticleVector quarks; + Particles quarks; if (iqf.particles().size() == 2) { flavour = abs( iqf.particles().front().pdgId() ); quarks = iqf.particles(); Modified: trunk/src/Analyses/SLD_2004_S5693039.cc ============================================================================== --- trunk/src/Analyses/SLD_2004_S5693039.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Analyses/SLD_2004_S5693039.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -50,7 +50,7 @@ // If we only have two quarks (qqbar), just take the flavour. // If we have more than two quarks, look for the highest energetic q-qbar pair. - ParticleVector quarks; + Particles quarks; if (iqf.particles().size() == 2) { flavour = abs( iqf.particles().front().pdgId() ); quarks = iqf.particles(); Modified: trunk/src/Projections/FParameter.cc ============================================================================== --- trunk/src/Projections/FParameter.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/FParameter.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -19,7 +19,7 @@ void FParameter::project(const Event& e) { - const ParticleVector prts = applyProjection<FinalState>(e, "FS").particles(); + const Particles prts = applyProjection<FinalState>(e, "FS").particles(); calc(prts); } Modified: trunk/src/Projections/FastJets.cc ============================================================================== --- trunk/src/Projections/FastJets.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/FastJets.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -80,7 +80,7 @@ void FastJets::project(const Event& e) { - ParticleVector particles; + Particles particles; if (_useInvisibles) { particles = applyProjection<FinalState>(e, "FS").particles(); } else { @@ -90,7 +90,7 @@ } - void FastJets::calc(const ParticleVector& ps) { + void FastJets::calc(const Particles& ps) { _particles.clear(); vector<fastjet::PseudoJet> vecs; // Store 4 vector data about each particle into vecs Modified: trunk/src/Projections/FinalState.cc ============================================================================== --- trunk/src/Projections/FinalState.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/FinalState.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -78,7 +78,7 @@ // If this is not itself the "open" FS, base the calculations on the open FS' results /// @todo In general, we'd like to calculate a restrictive FS based on the most restricted superset FS. - const ParticleVector allstable = applyProjection<FinalState>(e, "OpenFS").particles(); + const Particles allstable = applyProjection<FinalState>(e, "OpenFS").particles(); foreach (const Particle& p, allstable) { const bool passed = accept(p); // MSG_TRACE("Choosing: ID = " << p.pdgId() Modified: trunk/src/Projections/FoxWolframMoments.cc ============================================================================== --- trunk/src/Projections/FoxWolframMoments.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/FoxWolframMoments.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -19,10 +19,10 @@ // see: http://cepa.fnal.gov/psm/simulation/mcgen/lund/pythia_manual/pythia6.3/pythia6301/node215.html double sumEnergy = 0.0; - for (ParticleVector::const_iterator pi = fs.particles().begin(); pi != fs.particles().end(); ++pi) { + for (Particles::const_iterator pi = fs.particles().begin(); pi != fs.particles().end(); ++pi) { sumEnergy += pi->momentum().E(); const FourMomentum pi_4 = pi->momentum(); - for (ParticleVector::const_iterator pj = pi+1; pj != fs.particles().end(); ++pj) { + for (Particles::const_iterator pj = pi+1; pj != fs.particles().end(); ++pj) { const FourMomentum pj_4 = pj->momentum(); // Calculate x_ij = cos(theta_ij) Modified: trunk/src/Projections/Hemispheres.cc ============================================================================== --- trunk/src/Projections/Hemispheres.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/Hemispheres.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -15,7 +15,7 @@ FourMomentum p4With, p4Against; double Evis(0), broadWith(0), broadAgainst(0), broadDenom(0); const FinalState& fs = applyProjection<FinalState>(e, ax.getProjection("FS")); - const ParticleVector& particles = fs.particles(); + const Particles& particles = fs.particles(); MSG_DEBUG("Number of particles = " << particles.size()); foreach (const Particle& p, particles) { const FourMomentum p4 = p.momentum(); Modified: trunk/src/Projections/InvMassFinalState.cc ============================================================================== --- trunk/src/Projections/InvMassFinalState.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/InvMassFinalState.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -85,7 +85,7 @@ } - void InvMassFinalState::calc(const ParticleVector& inparticles) { + void InvMassFinalState::calc(const Particles& inparticles) { _theParticles.clear(); _particlePairs.clear(); Modified: trunk/src/Projections/LeadingParticlesFinalState.cc ============================================================================== --- trunk/src/Projections/LeadingParticlesFinalState.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/LeadingParticlesFinalState.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -29,15 +29,15 @@ const FinalState& fs = applyProjection<FinalState>(e, "FS"); // Temporary container - map<long, ParticleVector::const_iterator> tmp; + map<long, Particles::const_iterator> tmp; - const ParticleVector& particles = fs.particles(); + const Particles& particles = fs.particles(); MSG_DEBUG("Original final state particles size " << particles.size()); - ParticleVector::const_iterator ifs; + Particles::const_iterator ifs; for (ifs = particles.begin(); ifs != particles.end(); ++ifs) { if (inList(*ifs) && FinalState::accept(*ifs->genParticle())) { // Look for an existing particle in tmp container - map < long, ParticleVector::const_iterator >::const_iterator itmp = tmp.find(ifs->pdgId()); + map < long, Particles::const_iterator >::const_iterator itmp = tmp.find(ifs->pdgId()); if (itmp != tmp.end()) { // if a particle with this type has been already selected // If the new pT is higher than the previous one, then substitute... if (ifs->momentum().pT() > itmp->second->momentum().pT()) { @@ -51,7 +51,7 @@ } // Loop on the tmp container and fill _theParticles - map<long, ParticleVector::const_iterator>::const_iterator i; + map<long, Particles::const_iterator>::const_iterator i; for (i = tmp.begin(); i != tmp.end(); ++i) { MSG_DEBUG("LeadingParticlesFinalState is accepting particle ID " << i->second->pdgId() << " with momentum " << i->second->momentum()); Modified: trunk/src/Projections/LeptonClusters.cc ============================================================================== --- trunk/src/Projections/LeptonClusters.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/LeptonClusters.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -44,7 +44,7 @@ _clusteredLeptons.clear(); const FinalState& signal = applyProjection<FinalState>(e, "Signal"); - ParticleVector bareleptons = signal.particles(); + Particles bareleptons = signal.particles(); if (bareleptons.empty()) return; vector<ClusteredLepton> allClusteredLeptons; Modified: trunk/src/Projections/Multiplicity.cc ============================================================================== --- trunk/src/Projections/Multiplicity.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/Multiplicity.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -16,7 +16,7 @@ const FinalState& fs = applyProjection<FinalState>(e, "FS"); _totalMult = fs.particles().size(); _hadMult = 0; - for (ParticleVector::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { + for (Particles::const_iterator p = fs.particles().begin(); p != fs.particles().end(); ++p) { if (PID::isHadron(p->pdgId())) ++_hadMult; } } Modified: trunk/src/Projections/Sphericity.cc ============================================================================== --- trunk/src/Projections/Sphericity.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/Sphericity.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -32,7 +32,7 @@ void Sphericity::project(const Event& e) { - const ParticleVector prts = applyProjection<FinalState>(e, "FS").particles(); + const Particles prts = applyProjection<FinalState>(e, "FS").particles(); calc(prts); } Modified: trunk/src/Projections/VetoedFinalState.cc ============================================================================== --- trunk/src/Projections/VetoedFinalState.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/VetoedFinalState.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -60,23 +60,23 @@ } } - set<ParticleVector::iterator> toErase; + set<Particles::iterator> toErase; for (set<int>::iterator nIt = _nCompositeDecays.begin(); nIt != _nCompositeDecays.end() && !_theParticles.empty(); ++nIt) { - map<set<ParticleVector::iterator>, FourMomentum> oldMasses; - map<set<ParticleVector::iterator>, FourMomentum> newMasses; - set<ParticleVector::iterator> start; + map<set<Particles::iterator>, FourMomentum> oldMasses; + map<set<Particles::iterator>, FourMomentum> newMasses; + set<Particles::iterator> start; start.insert(_theParticles.begin()); - oldMasses.insert(pair<set<ParticleVector::iterator>, FourMomentum> + oldMasses.insert(pair<set<Particles::iterator>, FourMomentum> (start, _theParticles.begin()->momentum())); for (int nParts = 1; nParts != *nIt; ++nParts) { - for (map<set<ParticleVector::iterator>, FourMomentum>::iterator mIt = oldMasses.begin(); + for (map<set<Particles::iterator>, FourMomentum>::iterator mIt = oldMasses.begin(); mIt != oldMasses.end(); ++mIt) { - ParticleVector::iterator pStart = *(mIt->first.rbegin()); - for (ParticleVector::iterator pIt = pStart + 1; pIt != _theParticles.end(); ++pIt) { + Particles::iterator pStart = *(mIt->first.rbegin()); + for (Particles::iterator pIt = pStart + 1; pIt != _theParticles.end(); ++pIt) { FourMomentum cMom = mIt->second + pIt->momentum(); - set<ParticleVector::iterator> pList(mIt->first); + set<Particles::iterator> pList(mIt->first); pList.insert(pIt); newMasses[pList] = cMom; } @@ -84,7 +84,7 @@ oldMasses = newMasses; newMasses.clear(); } - for (map<set<ParticleVector::iterator>, FourMomentum>::iterator mIt = oldMasses.begin(); + for (map<set<Particles::iterator>, FourMomentum>::iterator mIt = oldMasses.begin(); mIt != oldMasses.end(); ++mIt) { double mass2 = mIt->second.mass2(); if (mass2 >= 0.0) { @@ -93,7 +93,7 @@ cIt != _compositeVetoes.upper_bound(*nIt); ++cIt) { BinaryCut massRange = cIt->second; if (mass < massRange.second && mass > massRange.first) { - for (set<ParticleVector::iterator>::iterator lIt = mIt->first.begin(); + for (set<Particles::iterator>::iterator lIt = mIt->first.begin(); lIt != mIt->first.end(); ++lIt) { toErase.insert(*lIt); } @@ -103,13 +103,13 @@ } } - for (set<ParticleVector::iterator>::reverse_iterator p = toErase.rbegin(); p != toErase.rend(); ++p) { + for (set<Particles::iterator>::reverse_iterator p = toErase.rbegin(); p != toErase.rend(); ++p) { _theParticles.erase(*p); } /// @todo Improve! for (ParentVetos::const_iterator vIt = _parentVetoes.begin(); vIt != _parentVetoes.end(); ++vIt) { - for (ParticleVector::iterator p = _theParticles.begin(); p != _theParticles.end(); ++p) { + for (Particles::iterator p = _theParticles.begin(); p != _theParticles.end(); ++p) { GenVertex* startVtx = p->genParticle()->production_vertex(); bool veto = false; if (startVtx!=0) { @@ -129,11 +129,11 @@ // Now veto on the FS foreach (const string& ifs, _vetofsnames) { const FinalState& vfs = applyProjection<FinalState>(e, ifs); - const ParticleVector& vfsp = vfs.particles(); - for (ParticleVector::iterator icheck = _theParticles.begin(); icheck != _theParticles.end(); ++icheck) { + const Particles& vfsp = vfs.particles(); + for (Particles::iterator icheck = _theParticles.begin(); icheck != _theParticles.end(); ++icheck) { if (icheck->genParticle() == NULL) continue; bool found = false; - for (ParticleVector::const_iterator ipart = vfsp.begin(); ipart != vfsp.end(); ++ipart){ + for (Particles::const_iterator ipart = vfsp.begin(); ipart != vfsp.end(); ++ipart){ if (ipart->genParticle() == NULL) continue; MSG_TRACE("Comparing barcode " << icheck->genParticle()->barcode() << " with veto particle " << ipart->genParticle()->barcode()); Modified: trunk/src/Projections/WFinder.cc ============================================================================== --- trunk/src/Projections/WFinder.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/WFinder.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -152,7 +152,7 @@ l_nu_ids += make_pair(-abs(_pid), abs(_nu_pid)); InvMassFinalState imfs(l_nu_ids, _minmass, _maxmass, _masstarget); imfs.useTransverseMass(_useTransverseMass); - ParticleVector tmp; + Particles tmp; tmp.insert(tmp.end(), leptons.clusteredLeptons().begin(), leptons.clusteredLeptons().end()); tmp.insert(tmp.end(), neutrinos.particles().begin(), neutrinos.particles().end()); imfs.calc(tmp); Modified: trunk/src/Projections/ZFinder.cc ============================================================================== --- trunk/src/Projections/ZFinder.cc Thu Mar 7 17:20:02 2013 (r4211) +++ trunk/src/Projections/ZFinder.cc Thu Mar 7 17:34:41 2013 (r4212) @@ -109,7 +109,7 @@ const LeptonClusters& leptons = applyProjection<LeptonClusters>(e, "LeptonClusters"); InvMassFinalState imfs(std::make_pair(_pid, -_pid), _minmass, _maxmass, _masstarget); - ParticleVector tmp; + Particles tmp; tmp.insert(tmp.end(), leptons.clusteredLeptons().begin(), leptons.clusteredLeptons().end()); imfs.calc(tmp);
More information about the Rivet-svn mailing list |