Page MenuHomeHEPForge
Files F11222015

No OneTemporary
Actions

View Options

diff --git a/src/Projections/FinalState.cc b/src/Projections/FinalState.cc
--- a/src/Projections/FinalState.cc
+++ b/src/Projections/FinalState.cc
@@ -1,84 +1,84 @@
// -*- C++ -*-
#include "Rivet/Projections/FinalState.hh"
namespace Rivet {
FinalState::FinalState(const Cut & c)
: ParticleFinder(c)
{
setName("FinalState");
const bool open = ( c == Cuts::open() );
MSG_TRACE("Check for open FS conditions: " << std::boolalpha << open);
if (!open) addProjection(FinalState(), "OpenFS");
}
/// @deprecated, keep for backwards compatibility for now.
FinalState::FinalState(double mineta, double maxeta, double minpt)
{
using namespace Cuts;
setName("FinalState");
const bool openpt = isZero(minpt);
const bool openeta = (mineta <= -MAXDOUBLE && maxeta >= MAXDOUBLE);
MSG_TRACE("Check for open FS conditions:" << std::boolalpha << " eta=" << openeta << ", pt=" << openpt);
if ( openpt && openeta ) {
_cuts = open();
}
else {
addProjection(FinalState(), "OpenFS");
if ( openeta )
_cuts = pT >= minpt;
else if ( openpt )
_cuts = etaIn(mineta,maxeta);
else
_cuts = etaIn(mineta,maxeta) & (pT >= minpt);
}
}
int FinalState::compare(const Projection& p) const {
const FinalState& other = dynamic_cast<const FinalState&>(p);
return _cuts == other._cuts ? EQUIVALENT : UNDEFINED;
}
void FinalState::project(const Event& e) {
_theParticles.clear();
// Handle "open FS" special case
- if ( _cuts == Cuts::open() ) {
+ if (_cuts == Cuts::OPEN) {
MSG_TRACE("Open FS processing: should only see this once per event (" << e.genEvent()->event_number() << ")");
- foreach (const GenParticle* p, Rivet::particles(e.genEvent())) {
+ for (const GenParticle* p : Rivet::particles(e.genEvent())) {
if (p->status() == 1) {
MSG_TRACE("FS GV = " << p->production_vertex());
_theParticles.push_back(Particle(*p));
}
}
return;
}
// 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 Particles allstable = applyProjection<FinalState>(e, "OpenFS").particles();
- foreach (const Particle& p, allstable) {
+ for (const Particle& p : allstable) {
const bool passed = accept(p);
- MSG_TRACE("Choosing: ID = " << p.pdgId()
- << ", pT = " << p.pT()
+ MSG_TRACE("Choosing: ID = " << p.pid()
+ << ", pT = " << p.pT()/GeV << " GeV"
<< ", eta = " << p.eta()
<< ": result = " << std::boolalpha << passed);
if (passed) _theParticles.push_back(p);
}
MSG_TRACE("Number of final-state particles = " << _theParticles.size());
}
/// Decide if a particle is to be accepted or not.
bool FinalState::accept(const Particle& p) const {
// Not having status == 1 should never happen!
assert(p.genParticle() == NULL || p.genParticle()->status() == 1);
return _cuts->accept(p);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, May 14, 11:15 AM (17 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5111385
Default Alt Text
(3 KB)

Event Timeline