|
[Rivet-svn] r3463 - in branches/2011-07-aida2yoda: . include/Rivet/Projections src/Projectionsblackhole at projects.hepforge.org blackhole at projects.hepforge.orgMon Oct 24 18:31:11 BST 2011
Author: hoeth Date: Mon Oct 24 18:31:11 2011 New Revision: 3463 Log: merge r3451-3452 from trunk Modified: branches/2011-07-aida2yoda/ChangeLog branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh branches/2011-07-aida2yoda/src/Projections/WFinder.cc branches/2011-07-aida2yoda/src/Projections/ZFinder.cc Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Mon Oct 24 18:29:13 2011 (r3462) +++ branches/2011-07-aida2yoda/ChangeLog Mon Oct 24 18:31:11 2011 (r3463) @@ -1,3 +1,7 @@ +2011-10-20 Frank Siegert <frank.siegert at cern.ch> + * Extend API of W/ZFinder to allow for specification of input final + state in which to search for leptons/photons. + 2011-10-19 Andy Buckley <andy at insectnation.org> * Adding new version of LHCB_2010_S8758301, based on submission Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh ============================================================================== --- branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh Mon Oct 24 18:29:13 2011 (r3462) +++ branches/2011-07-aida2yoda/include/Rivet/Projections/WFinder.hh Mon Oct 24 18:31:11 2011 (r3463) @@ -41,7 +41,8 @@ double missingET, double dRmax, bool clusterPhotons=true, bool trackPhotons=false, double masstarget=80.4, - bool useTransverseMass=false); + bool useTransverseMass=false, + FinalState inputfs=FinalState()); /// Constructor taking multiple eta/pT bounds @@ -62,7 +63,8 @@ double missingET, double dRmax, bool clusterPhotons=true, bool trackPhotons=false, double masstarget=80.4, - bool useTransverseMass=false); + bool useTransverseMass=false, + FinalState inputfs=FinalState()); /// Clone on the heap. @@ -117,7 +119,8 @@ double missingET, double dRmax, bool clusterPhotons, bool trackPhotons, double masstarget, - bool useTransverseMass); + bool useTransverseMass, + FinalState inputfs); private: Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh ============================================================================== --- branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh Mon Oct 24 18:29:13 2011 (r3462) +++ branches/2011-07-aida2yoda/include/Rivet/Projections/ZFinder.hh Mon Oct 24 18:31:11 2011 (r3463) @@ -38,7 +38,8 @@ PdgId pid, double minmass, double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget=91.2*GeV); + double masstarget=91.2*GeV, + FinalState inputfs=FinalState()); /// Constructor taking multiple eta/pT bounds @@ -55,7 +56,8 @@ PdgId pid, double minmass, const double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget=91.2*GeV); + double masstarget=91.2*GeV, + FinalState inputfs=FinalState()); /// Clone on the heap. @@ -103,7 +105,8 @@ double pTmin, PdgId pid, double minmass, double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget); + double masstarget, + FinalState inputfs); /// Mass cuts to apply to clustered leptons (cf. InvMassFinalState) double _minmass, _maxmass, _masstarget; Modified: branches/2011-07-aida2yoda/src/Projections/WFinder.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Projections/WFinder.cc Mon Oct 24 18:29:13 2011 (r3462) +++ branches/2011-07-aida2yoda/src/Projections/WFinder.cc Mon Oct 24 18:31:11 2011 (r3463) @@ -19,11 +19,12 @@ double missingET, double dRmax, bool clusterPhotons, bool trackPhotons, double masstarget, - bool useTransverseMass) { + bool useTransverseMass, + FinalState inputfs) { vector<pair<double, double> > etaRanges; etaRanges += std::make_pair(etaMin, etaMax); _init(etaRanges, pTmin, pid, minmass, maxmass, missingET, - dRmax, clusterPhotons, trackPhotons, masstarget, useTransverseMass); + dRmax, clusterPhotons, trackPhotons, masstarget, useTransverseMass, inputfs); } @@ -34,9 +35,10 @@ double missingET, double dRmax, bool clusterPhotons, bool trackPhotons, double masstarget, - bool useTransverseMass) { + bool useTransverseMass, + FinalState inputfs) { _init(etaRanges, pTmin, pid, minmass, maxmass, missingET, - dRmax, clusterPhotons, trackPhotons, masstarget, useTransverseMass); + dRmax, clusterPhotons, trackPhotons, masstarget, useTransverseMass, inputfs); } @@ -47,7 +49,8 @@ double missingET, double dRmax, bool clusterPhotons, bool trackPhotons, double masstarget, - bool useTransverseMass) + bool useTransverseMass, + FinalState inputfs) { setName("WFinder"); @@ -64,21 +67,20 @@ assert(abs(_nu_pid) == NU_E || abs(_nu_pid) == NU_MU); // Don't make pT or eta cuts on the neutrino - IdentifiedFinalState neutrinos; + IdentifiedFinalState neutrinos(inputfs); neutrinos.acceptNeutrinos(); addProjection(neutrinos, "Neutrinos"); // Lepton clusters - FinalState fs; - IdentifiedFinalState bareleptons(fs); + IdentifiedFinalState bareleptons(inputfs); bareleptons.acceptIdPair(pid); - LeptonClusters leptons(fs, bareleptons, dRmax, + LeptonClusters leptons(inputfs, bareleptons, dRmax, clusterPhotons, etaRanges, pTmin); addProjection(leptons, "LeptonClusters"); // Add MissingMomentum proj to calc MET - MissingMomentum vismom(fs); + MissingMomentum vismom(inputfs); addProjection(vismom, "MissingET"); // Set ETmiss _etMiss = missingET; Modified: branches/2011-07-aida2yoda/src/Projections/ZFinder.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Projections/ZFinder.cc Mon Oct 24 18:29:13 2011 (r3462) +++ branches/2011-07-aida2yoda/src/Projections/ZFinder.cc Mon Oct 24 18:31:11 2011 (r3463) @@ -15,10 +15,11 @@ PdgId pid, double minmass, double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget) { + double masstarget, + FinalState inputfs) { vector<pair<double, double> > etaRanges; etaRanges += std::make_pair(etaMin, etaMax); - _init(etaRanges, pTmin, pid, minmass, maxmass, dRmax, clusterPhotons, trackPhotons, masstarget); + _init(etaRanges, pTmin, pid, minmass, maxmass, dRmax, clusterPhotons, trackPhotons, masstarget, inputfs); } @@ -27,8 +28,9 @@ PdgId pid, double minmass, const double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget) { - _init(etaRanges, pTmin, pid, minmass, maxmass, dRmax, clusterPhotons, trackPhotons, masstarget); + double masstarget, + FinalState inputfs) { + _init(etaRanges, pTmin, pid, minmass, maxmass, dRmax, clusterPhotons, trackPhotons, masstarget, inputfs); } @@ -36,7 +38,8 @@ double pTmin, PdgId pid, double minmass, double maxmass, double dRmax, bool clusterPhotons, bool trackPhotons, - double masstarget) + double masstarget, + FinalState inputfs) { setName("ZFinder"); @@ -46,10 +49,9 @@ _pid = pid; _trackPhotons = trackPhotons; - FinalState fs; - IdentifiedFinalState bareleptons(fs); + IdentifiedFinalState bareleptons(inputfs); bareleptons.acceptIdPair(pid); - LeptonClusters leptons(fs, bareleptons, dRmax, + LeptonClusters leptons(inputfs, bareleptons, dRmax, clusterPhotons, etaRanges, pTmin); addProjection(leptons, "LeptonClusters");
More information about the Rivet-svn mailing list |