|
|
[Rivet-svn] r2918 - in trunk: include/Rivet/Projections src/Analyses src/Projections
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Mon Feb 7 14:45:15 GMT 2011
Author: fsiegert
Date: Mon Feb 7 14:45:15 2011
New Revision: 2918
Log:
ZFinder fixes, part 2/3: Add option for separate settings of photon
clustering to be used for a) adding to leptons and b) excluding from
jets (to account for how the D0 Z->mumu analyses do it).
At the same time remove dR(l,j) cut from two D0 Z->mumu analyses which
should not have been present at particle level.
Modified:
trunk/include/Rivet/Projections/ZFinder.hh
trunk/src/Analyses/CDF_2000_S4155203.cc
trunk/src/Analyses/CDF_2009_S8383952.cc
trunk/src/Analyses/D0_2008_S7554427.cc
trunk/src/Analyses/D0_2008_S7863608.cc
trunk/src/Analyses/D0_2009_S8202443.cc
trunk/src/Analyses/D0_2009_S8349509.cc
trunk/src/Analyses/D0_2010_S8671338.cc
trunk/src/Analyses/D0_2010_S8821313.cc
trunk/src/Analyses/MC_HJETS.cc
trunk/src/Analyses/MC_ZJETS.cc
trunk/src/Analyses/MC_ZZJETS.cc
trunk/src/Projections/ZFinder.cc
Modified: trunk/include/Rivet/Projections/ZFinder.hh
==============================================================================
--- trunk/include/Rivet/Projections/ZFinder.hh Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/include/Rivet/Projections/ZFinder.hh Mon Feb 7 14:45:15 2011 (r2918)
@@ -25,31 +25,34 @@
/// Constructor taking a FinalState and type of the leptons, mass window,
/// and maximum dR of photons around leptons to take into account for Z
- /// reconstruction.
+ /// reconstruction (both for clustering to leptons, and exclusion from jets).
ZFinder(const FinalState& fs,
PdgId pid,
double m2_min, double m2_max,
- double dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion);
/// Constructor taking single eta/pT bounds and type of the leptons, mass
/// window, and maximum dR of photons around leptons to take into account
- /// for Z reconstruction.
+ /// for Z reconstruction (both for clustering to leptons, and exclusion from jets).
ZFinder(double etaMin, double etaMax,
double pTmin,
PdgId pid,
double m2_min, double m2_max,
- double dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion);
/// Constructor taking multiple eta/pT bounds and type of the leptons, mass
/// window, and maximum dR of photons around leptons to take into account
- /// for Z reconstruction.
+ /// for Z reconstruction (both for clustering to leptons, and exclusion from jets).
ZFinder(const std::vector<std::pair<double, double> >& etaRanges,
double pTmin,
PdgId pid,
double m2_min, const double m2_max,
- double dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion);
/// Clone on the heap.
@@ -85,13 +88,15 @@
void _init(const std::vector<std::pair<double, double> >& etaRanges,
double pTmin, PdgId pid,
double m2_min, double m2_max,
- double dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion);
/// Common implementation of constructor operation, taking FS.
void _init(const FinalState& fs,
PdgId pid,
double m2_min, double m2_max,
- double dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion);
};
Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -28,7 +28,7 @@
void init() {
// Set up projections
- ZFinder zfinder(FinalState(), ELECTRON, 66.0*GeV, 116.0*GeV, 0.2);
+ ZFinder zfinder(FinalState(), ELECTRON, 66.0*GeV, 116.0*GeV, 0.0, 0.0);
addProjection(zfinder, "ZFinder");
// Book histogram
Modified: trunk/src/Analyses/CDF_2009_S8383952.cc
==============================================================================
--- trunk/src/Analyses/CDF_2009_S8383952.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/CDF_2009_S8383952.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -38,7 +38,7 @@
// this seems to have been corrected completely for all selection cuts,
// i.e. eta cuts and pT cuts on leptons.
ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
- 66.0*GeV, 116.0*GeV, 0.2);
+ 66.0*GeV, 116.0*GeV, 0.0, 0.0);
addProjection(zfinder, "ZFinder");
Modified: trunk/src/Analyses/D0_2008_S7554427.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7554427.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2008_S7554427.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -30,7 +30,7 @@
/// Book histograms
void init() {
ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
- 40.0*GeV, 200.0*GeV, 0.2);
+ 40.0*GeV, 200.0*GeV, 0.2, 0.2);
addProjection(zfinder, "ZFinder");
_h_ZpT = bookHistogram1D(1, 1, 1);
Modified: trunk/src/Analyses/D0_2008_S7863608.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7863608.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2008_S7863608.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -30,7 +30,7 @@
/// Book histograms
void init() {
- ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.0, 0.2);
addProjection(zfinder, "ZFinder");
FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);
@@ -74,16 +74,6 @@
vetoEvent;
}
- // cut on Delta R between jet and muons
- foreach (const Jet& j, jets_cut) {
- foreach (const Particle& mu, zfinder.constituentsFinalState().particles()) {
- if (deltaR(mu.momentum().pseudorapidity(), mu.momentum().azimuthalAngle(),
- j.momentum().pseudorapidity(), j.momentum().azimuthalAngle()) < 0.5) {
- vetoEvent;
- }
- }
- }
-
const FourMomentum Zmom = zfinder.particles()[0].momentum();
// In jet pT
Modified: trunk/src/Analyses/D0_2009_S8202443.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8202443.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2009_S8202443.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -36,14 +36,14 @@
etaRanges.push_back(make_pair(-1.1, 1.1));
etaRanges.push_back(make_pair(1.5, 2.5));
ZFinder zfinder_constrained(etaRanges, 25.0*GeV, ELECTRON,
- 65.0*GeV, 115.0*GeV, 0.2);
+ 65.0*GeV, 115.0*GeV, 0.2, 0.2);
addProjection(zfinder_constrained, "ZFinderConstrained");
FastJets conefinder_constrained(zfinder_constrained.remainingFinalState(),
FastJets::D0ILCONE, 0.5);
addProjection(conefinder_constrained, "ConeFinderConstrained");
// Unconstrained leptons
- ZFinder zfinder(FinalState(), ELECTRON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zfinder(FinalState(), ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, 0.2);
addProjection(zfinder, "ZFinder");
FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);
addProjection(conefinder, "ConeFinder");
Modified: trunk/src/Analyses/D0_2009_S8349509.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8349509.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2009_S8349509.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -32,7 +32,7 @@
/// Book histograms
void init() {
- ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.0, 0.2);
addProjection(zfinder, "ZFinder");
FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);
@@ -88,15 +88,6 @@
vetoEvent;
}
- // Cut on Delta R between jet and muons
- foreach (const Jet& j, jets) {
- foreach (const Particle& mu, zfinder.constituentsFinalState().particles()) {
- if (deltaR(mu.momentum(), j.momentum()) < 0.5) {
- vetoEvent;
- }
- }
- }
-
const FourMomentum jetmom = jets[0].momentum();
double yZ = Zmom.rapidity();
double yjet = jetmom.rapidity();
Modified: trunk/src/Analyses/D0_2010_S8671338.cc
==============================================================================
--- trunk/src/Analyses/D0_2010_S8671338.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2010_S8671338.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -32,7 +32,7 @@
/// Add projections and book histograms
void init() {
- ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.0);
+ ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.0, 0.2);
addProjection(zfinder, "ZFinder");
_h_Z_pT_normalised = bookHistogram1D(1, 1, 1);
Modified: trunk/src/Analyses/D0_2010_S8821313.cc
==============================================================================
--- trunk/src/Analyses/D0_2010_S8821313.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/D0_2010_S8821313.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -40,10 +40,10 @@
etaRanges_ee.push_back(make_pair(-3.0, -1.5));
etaRanges_ee.push_back(make_pair(-1.1, 1.1));
etaRanges_ee.push_back(make_pair(1.5, 3.0));
- ZFinder zfinder_ee(etaRanges_ee, 20.0*GeV, ELECTRON, 70.0*GeV, 110.0*GeV, 0.2);
+ ZFinder zfinder_ee(etaRanges_ee, 20.0*GeV, ELECTRON, 70.0*GeV, 110.0*GeV, 0.2, 0.0);
addProjection(zfinder_ee, "zfinder_ee");
- ZFinder zfinder_mm(-2.0, 2.0, 15.0*GeV, MUON, 70.0*GeV, 110.0*GeV, 0.0);
+ ZFinder zfinder_mm(-2.0, 2.0, 15.0*GeV, MUON, 70.0*GeV, 110.0*GeV, 0.0, 0.0);
addProjection(zfinder_mm, "zfinder_mm");
/// Book histograms here
Modified: trunk/src/Analyses/MC_HJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_HJETS.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/MC_HJETS.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -25,7 +25,7 @@
/// Book histograms
void init() {
- ZFinder hfinder(-3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.2);
+ ZFinder hfinder(-3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.0, 0.0);
addProjection(hfinder, "Hfinder");
FastJets jetpro(hfinder.remainingFinalState(), FastJets::KT, 0.7);
addProjection(jetpro, "Jets");
Modified: trunk/src/Analyses/MC_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/MC_ZJETS.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -25,7 +25,7 @@
/// Book histograms
void init() {
- ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, 0.2);
addProjection(zfinder, "ZFinder");
FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7);
addProjection(jetpro, "Jets");
Modified: trunk/src/Analyses/MC_ZZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZZJETS.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Analyses/MC_ZZJETS.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -26,9 +26,9 @@
/// Book histograms
void init() {
- ZFinder zeefinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zeefinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, 0.2);
addProjection(zeefinder, "ZeeFinder");
- ZFinder zmmfinder(-3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2);
+ ZFinder zmmfinder(-3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, 0.2);
addProjection(zmmfinder, "ZmmFinder");
VetoedFinalState jetinput;
jetinput
Modified: trunk/src/Projections/ZFinder.cc
==============================================================================
--- trunk/src/Projections/ZFinder.cc Mon Feb 7 13:40:58 2011 (r2917)
+++ trunk/src/Projections/ZFinder.cc Mon Feb 7 14:45:15 2011 (r2918)
@@ -13,8 +13,9 @@
ZFinder::ZFinder(const FinalState& fs,
PdgId pid,
double m2_min, double m2_max,
- double dRmax) {
- _init(fs, pid, m2_min, m2_max, dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion) {
+ _init(fs, pid, m2_min, m2_max, dRmax_clustering, dRmax_exclusion);
}
@@ -22,10 +23,11 @@
double pTmin,
PdgId pid,
double m2_min, double m2_max,
- double dRmax) {
+ double dRmax_clustering,
+ double dRmax_exclusion) {
vector<pair<double, double> > etaRanges;
etaRanges += std::make_pair(etaMin, etaMax);
- _init(etaRanges, pTmin, pid, m2_min, m2_max, dRmax);
+ _init(etaRanges, pTmin, pid, m2_min, m2_max, dRmax_clustering, dRmax_exclusion);
}
@@ -33,24 +35,27 @@
double pTmin,
PdgId pid,
double m2_min, const double m2_max,
- double dRmax) {
- _init(etaRanges, pTmin, pid, m2_min, m2_max, dRmax);
+ double dRmax_clustering,
+ double dRmax_exclusion) {
+ _init(etaRanges, pTmin, pid, m2_min, m2_max, dRmax_clustering, dRmax_exclusion);
}
void ZFinder::_init(const std::vector<std::pair<double, double> >& etaRanges,
double pTmin, PdgId pid,
double m2_min, double m2_max,
- double dRmax) {
+ double dRmax_clustering,
+ double dRmax_exclusion) {
FinalState fs(etaRanges, pTmin);
- _init(fs, pid, m2_min, m2_max, dRmax);
+ _init(fs, pid, m2_min, m2_max, dRmax_clustering, dRmax_exclusion);
}
void ZFinder::_init(const FinalState& fs,
PdgId pid,
double m2_min, double m2_max,
- double dRmax)
+ double dRmax_clustering,
+ double dRmax_exclusion)
{
setName("ZFinder");
@@ -59,12 +64,12 @@
InvMassFinalState imfs(fs, std::make_pair(pid, -pid), m2_min, m2_max);
addProjection(imfs, "IMFS");
- ClusteredPhotons cphotons(FinalState(), imfs, dRmax);
+ ClusteredPhotons cphotons(FinalState(), imfs, dRmax_clustering);
addProjection(cphotons, "CPhotons");
VetoedFinalState remainingFS;
remainingFS.addVetoOnThisFinalState(imfs);
- remainingFS.addVetoOnThisFinalState(cphotons);
+ remainingFS.addVetoOnThisFinalState(ClusteredPhotons(FinalState(), imfs, dRmax_exclusion));
addProjection(remainingFS, "RFS");
}
More information about the Rivet-svn
mailing list
|