|
[Rivet-svn] r2684 - in trunk: include/Rivet/Projections src/Projectionsblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Aug 30 14:18:33 BST 2010
Author: fsiegert Date: Mon Aug 30 14:18:33 2010 New Revision: 2684 Log: Make clustered photons available in W/ZFinder. Modified: trunk/include/Rivet/Projections/VetoedFinalState.hh trunk/include/Rivet/Projections/WFinder.hh trunk/include/Rivet/Projections/ZFinder.hh trunk/src/Projections/WFinder.cc trunk/src/Projections/ZFinder.cc Modified: trunk/include/Rivet/Projections/VetoedFinalState.hh ============================================================================== --- trunk/include/Rivet/Projections/VetoedFinalState.hh Mon Aug 30 13:48:17 2010 (r2683) +++ trunk/include/Rivet/Projections/VetoedFinalState.hh Mon Aug 30 14:18:33 2010 (r2684) @@ -148,7 +148,7 @@ /// Veto particles from a supplied final state. - VetoedFinalState& addVetoOnThisFinalState(FinalState& fs) { + VetoedFinalState& addVetoOnThisFinalState(const FinalState& fs) { stringstream st_name; st_name << "FS_" << _vetofsnames.size(); string name = st_name.str(); Modified: trunk/include/Rivet/Projections/WFinder.hh ============================================================================== --- trunk/include/Rivet/Projections/WFinder.hh Mon Aug 30 13:48:17 2010 (r2683) +++ trunk/include/Rivet/Projections/WFinder.hh Mon Aug 30 14:18:33 2010 (r2684) @@ -72,6 +72,9 @@ /// Access to the W constituent leptons const FinalState& constituentLeptonsFinalState() const; + /// Access to the photons which have been clustered to the leptons + const FinalState& clusteredPhotonsFinalState() const; + protected: Modified: trunk/include/Rivet/Projections/ZFinder.hh ============================================================================== --- trunk/include/Rivet/Projections/ZFinder.hh Mon Aug 30 13:48:17 2010 (r2683) +++ trunk/include/Rivet/Projections/ZFinder.hh Mon Aug 30 14:18:33 2010 (r2684) @@ -68,6 +68,9 @@ /// (e.g. for more fine-grained cuts on the leptons) const FinalState& constituentsFinalState() const; + /// Access to the photons which have been clustered to the leptons + const FinalState& clusteredPhotonsFinalState() const; + protected: /// Apply the projection on the supplied event. Modified: trunk/src/Projections/WFinder.cc ============================================================================== --- trunk/src/Projections/WFinder.cc Mon Aug 30 13:48:17 2010 (r2683) +++ trunk/src/Projections/WFinder.cc Mon Aug 30 14:18:33 2010 (r2684) @@ -125,6 +125,12 @@ } + const FinalState& WFinder::clusteredPhotonsFinalState() const + { + return getProjection<FinalState>("CPhotons"); + } + + int WFinder::compare(const Projection& p) const { PCmp cmp = mkNamedPCmp(p, "IMFS"); if (cmp != EQUIVALENT) return cmp; Modified: trunk/src/Projections/ZFinder.cc ============================================================================== --- trunk/src/Projections/ZFinder.cc Mon Aug 30 13:48:17 2010 (r2683) +++ trunk/src/Projections/ZFinder.cc Mon Aug 30 14:18:33 2010 (r2684) @@ -83,6 +83,11 @@ return getProjection<FinalState>("IMFS"); } + const FinalState& ZFinder::clusteredPhotonsFinalState() const + { + return getProjection<FinalState>("CPhotons"); + } + int ZFinder::compare(const Projection& p) const { PCmp cmp = mkNamedPCmp(p, "IMFS"); if (cmp != EQUIVALENT) return cmp;
More information about the Rivet-svn mailing list |