Skip to content

Commit 0137291

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46749 from dsidirop1/topDQMReco
Updated Input tags and code additions for TOP Production DQM GEN-SIM-RECO
2 parents 80fe037 + fd13e2c commit 0137291

12 files changed

+292
-289
lines changed

‎DQM/Physics/interface/TopDQMHelpers.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,17 +378,13 @@ bool SelectionStep<Object>::select(const edm::Event& event, const std::string& t
378378
if (dynamic_cast<const reco::PFCandidate*>(&*obj)) {
379379
reco::PFCandidate objtmp = dynamic_cast<const reco::PFCandidate&>(*obj);
380380

381-
if (objtmp.muonRef().isNonnull() && type == "muon") {
381+
if (type == "muon") {
382382
if (select_(*obj)) {
383383
++n;
384384
}
385-
} else if (objtmp.gsfElectronRef().isNonnull() && type == "electron") {
385+
} else if (type == "electron") {
386386
if (select_(*obj)) {
387-
if (electronId_.isUninitialized()) {
388-
++n;
389-
} else if (((double)(*electronId)[obj->gsfElectronRef()] >= eidCutValue_)) {
390-
++n;
391-
}
387+
++n;
392388
}
393389
// idx_gsf++;
394390
}

‎DQM/Physics/python/singleTopDQM_cfi.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
tightJetCut = "(chargedHadronEnergyFraction()>0 && chargedMultiplicity()>0 && chargedEmEnergyFraction()<0.99 && neutralHadronEnergyFraction()<0.90 && neutralEmEnergyFraction()<0.90 && (chargedMultiplicity()+neutralMultiplicity())>1) && abs(eta)<=2.4 "
1010

1111
#Loose muon selection
12-
looseMuonCut = "(muonRef.isNonnull && (muonRef.isGlobalMuon || muonRef.isTrackerMuon) && muonRef.isPFMuon)"
13-
looseIsoCut = "(muonRef.pfIsolationR04.sumChargedHadronPt + max(0., muonRef.pfIsolationR04.sumNeutralHadronEt + muonRef.pfIsolationR04.sumPhotonEt - 0.5 * muonRef.pfIsolationR04.sumPUPt) ) / muonRef.pt < 0.25"
12+
looseMuonCut = "((isGlobalMuon || isTrackerMuon) && isPFMuon)"
13+
looseIsoCut = "((pfIsolationR04.sumChargedHadronPt + max(0., pfIsolationR04.sumNeutralHadronEt + pfIsolationR04.sumPhotonEt - 0.5 * pfIsolationR04.sumPUPt) ) / pt < 0.25)"
1414

1515
#Medium muon selection. Also requires either good global muon or tight segment compatibility
16-
mediumMuonCut = looseMuonCut + " muonRef.innerTrack.validFraction > 0.8"
16+
mediumMuonCut = looseMuonCut + " innerTrack.validFraction > 0.8"
1717

1818
#Tight muon selection. Lacks distance to primary vertex variables, dz<0.5, dxy < 0.2. Now done at .cc
19-
tightMuonCut = "muonRef.isNonnull && muonRef.isGlobalMuon && muonRef.isPFMuon && muonRef.globalTrack.normalizedChi2 < 10. && muonRef.globalTrack.hitPattern.numberOfValidMuonHits > 0 && " + \
20-
"muonRef.numberOfMatchedStations > 1 && muonRef.innerTrack.hitPattern.numberOfValidPixelHits > 0 && muonRef.innerTrack.hitPattern.trackerLayersWithMeasurement > 5 "
21-
tightIsoCut = "(muonRef.pfIsolationR04.sumChargedHadronPt + max(0., muonRef.pfIsolationR04.sumNeutralHadronEt + muonRef.pfIsolationR04.sumPhotonEt - 0.5 * muonRef.pfIsolationR04.sumPUPt) ) / muonRef.pt < 0.15"
19+
tightMuonCut = "isGlobalMuon && isPFMuon && globalTrack.normalizedChi2 < 10. && globalTrack.hitPattern.numberOfValidMuonHits > 0 && " + \
20+
"numberOfMatchedStations > 1 && innerTrack.hitPattern.numberOfValidPixelHits > 0 && innerTrack.hitPattern.trackerLayersWithMeasurement > 5 "
21+
tightIsoCut = "(pfIsolationR04.sumChargedHadronPt + max(0., pfIsolationR04.sumNeutralHadronEt + pfIsolationR04.sumPhotonEt - 0.5 * pfIsolationR04.sumPUPt) ) / pt < 0.15"
2222

2323
#Electron selections
24-
looseEleCut = "(( gsfElectronRef.full5x5_sigmaIetaIeta() < 0.011 && gsfElectronRef.superCluster().isNonnull() && gsfElectronRef.superCluster().seed().isNonnull() && (gsfElectronRef.deltaEtaSuperClusterTrackAtVtx() - gsfElectronRef.superCluster().eta() + gsfElectronRef.superCluster().seed().eta()) < 0.00477 && abs(gsfElectronRef.deltaPhiSuperClusterTrackAtVtx()) < 0.222 && gsfElectronRef.hadronicOverEm() < 0.298 && abs(1.0 - gsfElectronRef.eSuperClusterOverP())*1.0/gsfElectronRef.ecalEnergy() < 0.241 && gsfElectronRef.gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(gsfElectronRef.superCluster().eta()) < 1.479) || (gsfElectronRef.full5x5_sigmaIetaIeta() < 0.0314 && gsfElectronRef.superCluster().isNonnull() && gsfElectronRef.superCluster().seed().isNonnull() && (gsfElectronRef.deltaEtaSuperClusterTrackAtVtx() - gsfElectronRef.superCluster().eta() + gsfElectronRef.superCluster().seed().eta()) < 0.00868 && abs(gsfElectronRef.deltaPhiSuperClusterTrackAtVtx()) < 0.213 && gsfElectronRef.hadronicOverEm() < 0.101 && abs(1.0 - gsfElectronRef.eSuperClusterOverP())*1.0/gsfElectronRef.ecalEnergy() < 0.14 && gsfElectronRef.gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(gsfElectronRef.superCluster().eta()) > 1.479))"
24+
looseEleCut = "((full5x5_sigmaIetaIeta() < 0.011 && superCluster().isNonnull() && superCluster().seed().isNonnull() && (deltaEtaSuperClusterTrackAtVtx() - superCluster().eta() + superCluster().seed().eta()) < 0.00477 && abs(deltaPhiSuperClusterTrackAtVtx()) < 0.222 && hadronicOverEm() < 0.298 && abs(1.0 - eSuperClusterOverP())*1.0/ecalEnergy() < 0.241 && gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(superCluster().eta()) < 1.479) || (full5x5_sigmaIetaIeta() < 0.0314 && superCluster().isNonnull() && superCluster().seed().isNonnull() && (deltaEtaSuperClusterTrackAtVtx() - superCluster().eta() + superCluster().seed().eta()) < 0.00868 && abs(deltaPhiSuperClusterTrackAtVtx()) < 0.213 && hadronicOverEm() < 0.101 && abs(1.0 - eSuperClusterOverP())*1.0/ecalEnergy() < 0.14 && gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(superCluster().eta()) > 1.479))"
2525

26-
tightEleCut = "((gsfElectronRef.full5x5_sigmaIetaIeta() < 0.00998 && gsfElectronRef.superCluster().isNonnull() && gsfElectronRef.superCluster().seed().isNonnull() && (gsfElectronRef.deltaEtaSuperClusterTrackAtVtx() - gsfElectronRef.superCluster().eta() + gsfElectronRef.superCluster().seed().eta()) < 0.00308 && abs(gsfElectronRef.deltaPhiSuperClusterTrackAtVtx()) < 0.0816 && gsfElectronRef.hadronicOverEm() < 0.0414 && abs(1.0 - gsfElectronRef.eSuperClusterOverP())*1.0/gsfElectronRef.ecalEnergy() < 0.0129 && gsfElectronRef.gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(gsfElectronRef.superCluster().eta()) < 1.479) || (gsfElectronRef.full5x5_sigmaIetaIeta() < 0.0292 && gsfElectronRef.superCluster().isNonnull() && gsfElectronRef.superCluster().seed().isNonnull() && (gsfElectronRef.deltaEtaSuperClusterTrackAtVtx() - gsfElectronRef.superCluster().eta() + gsfElectronRef.superCluster().seed().eta()) < 0.00605 && abs(gsfElectronRef.deltaPhiSuperClusterTrackAtVtx()) < 0.0394 && gsfElectronRef.hadronicOverEm() < 0.0641 && abs(1.0 - gsfElectronRef.eSuperClusterOverP())*1.0/gsfElectronRef.ecalEnergy() < 0.0129 && gsfElectronRef.gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(gsfElectronRef.superCluster().eta()) > 1.479))"
26+
tightEleCut = "((full5x5_sigmaIetaIeta() < 0.00998 && superCluster().isNonnull() && superCluster().seed().isNonnull() && (deltaEtaSuperClusterTrackAtVtx() - superCluster().eta() + superCluster().seed().eta()) < 0.00308 && abs(deltaPhiSuperClusterTrackAtVtx()) < 0.0816 && hadronicOverEm() < 0.0414 && abs(1.0 - eSuperClusterOverP())*1.0/ecalEnergy() < 0.0129 && gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(superCluster().eta()) < 1.479) || (full5x5_sigmaIetaIeta() < 0.0292 && superCluster().isNonnull() && superCluster().seed().isNonnull() && (deltaEtaSuperClusterTrackAtVtx() - superCluster().eta() + superCluster().seed().eta()) < 0.00605 && abs(deltaPhiSuperClusterTrackAtVtx()) < 0.0394 && hadronicOverEm() < 0.0641 && abs(1.0 - eSuperClusterOverP())*1.0/ecalEnergy() < 0.0129 && gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 1 && abs(superCluster().eta()) > 1.479))"
2727

2828
from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
2929

@@ -37,8 +37,8 @@
3737
setup = cms.PSet(
3838
directory = cms.string("Physics/Top/SingleTopMuonMediumDQM/"),
3939
sources = cms.PSet(
40-
muons = cms.InputTag("pfIsolatedMuonsEI"),
41-
elecs = cms.InputTag("pfIsolatedElectronsEI"),
40+
muons = cms.InputTag("muons"),
41+
elecs = cms.InputTag("gedGsfElectrons"),
4242
jets = cms.InputTag("ak4PFJetsCHS"),
4343
mets = cms.VInputTag("pfMet"),
4444
pvs = cms.InputTag("offlinePrimaryVertices")
@@ -50,7 +50,7 @@
5050
select = cms.string(PVCut)
5151
),
5252
elecExtras = cms.PSet(
53-
select = cms.string(tightEleCut + "& pt>20 & abs(eta)<2.5 & (abs(gsfElectronRef.superCluster().eta()) <= 1.4442 || abs(gsfElectronRef.superCluster().eta()) >= 1.5660)"),
53+
select = cms.string(tightEleCut + "& pt>20 & abs(eta)<2.5 & (abs(superCluster().eta()) <= 1.4442 || abs(superCluster().eta()) >= 1.5660)"),
5454
rho = cms.InputTag("fixedGridRhoFastjetAll"),
5555
),
5656
muonExtras = cms.PSet(
@@ -62,10 +62,10 @@
6262
select = cms.string("pt>30 & abs(eta)< 2.4"),
6363
jetBTaggers = cms.PSet(
6464
cvsVertex = cms.PSet(
65-
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
66-
workingPoint = cms.double(0.890)
65+
label = cms.InputTag("pfDeepCSVJetTags:probb"),
66+
workingPoint = cms.double(0.4168)
6767
)
68-
),
68+
)
6969
),
7070
massExtras = cms.PSet(
7171
lowerEdge = cms.double( 70.),
@@ -87,7 +87,7 @@
8787
selection = cms.VPSet(
8888
cms.PSet(
8989
label = cms.string("muons/pf:step0"),
90-
src = cms.InputTag("pfIsolatedMuonsEI"),
90+
src = cms.InputTag("muons"),
9191
select = cms.string(tightMuonCut + " && pt>20 & abs(eta)<2.4"),
9292
min = cms.int32(1),
9393
),
@@ -118,8 +118,8 @@
118118
## communication to TopCom!
119119
directory = cms.string("Physics/Top/SingleTopElectronMediumDQM/"),
120120
sources = cms.PSet(
121-
muons = cms.InputTag("pfIsolatedMuonsEI"),
122-
elecs = cms.InputTag("pfIsolatedElectronsEI"),
121+
muons = cms.InputTag("muons"),
122+
elecs = cms.InputTag("gedGsfElectrons"),
123123
jets = cms.InputTag("ak4PFJetsCHS"),
124124
mets = cms.VInputTag("pfMet"),
125125
pvs = cms.InputTag("offlinePrimaryVertices")
@@ -131,7 +131,7 @@
131131
select = cms.string(PVCut)
132132
),
133133
elecExtras = cms.PSet(
134-
select = cms.string(tightEleCut + "& pt>20 & abs(eta)<2.5 & (abs(gsfElectronRef.superCluster().eta()) <= 1.4442 || abs(gsfElectronRef.superCluster().eta()) >= 1.5660)"),
134+
select = cms.string(tightEleCut + "& pt>20 & abs(eta)<2.5 & (abs(superCluster().eta()) <= 1.4442 || abs(superCluster().eta()) >= 1.5660)"),
135135
rho = cms.InputTag("fixedGridRhoFastjetAll"),
136136
),
137137
muonExtras = cms.PSet(
@@ -143,10 +143,10 @@
143143
select = cms.string("pt>30 & abs(eta)< 2.4"),
144144
jetBTaggers = cms.PSet(
145145
cvsVertex = cms.PSet(
146-
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
147-
workingPoint = cms.double(0.890)
146+
label = cms.InputTag("pfDeepCSVJetTags:probb"),
147+
workingPoint = cms.double(0.4168)
148148
)
149-
),
149+
)
150150
),
151151
massExtras = cms.PSet(
152152
lowerEdge = cms.double( 70.),
@@ -175,14 +175,14 @@
175175
# label = cms.string("elecs/pf:step0"),
176176
# src = cms.InputTag("pfIsolatedElectronsEI"),
177177
# electronId = cms.PSet( src = cms.InputTag("mvaTrigV0"), cutValue = cms.double(0.5) ),
178-
# select = cms.string("pt>30 & abs(eta)<2.5 & abs(gsfElectronRef.gsfTrack.d0)<0.02 && gsfElectronRef.gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 0 && (abs(gsfElectronRef.superCluster.eta) <= 1.4442 || abs(gsfElectronRef.superCluster.eta) >= 1.5660) && " + EletightIsoCut),
178+
# select = cms.string("pt>30 & abs(eta)<2.5 & abs(gsfTrack.d0)<0.02 && gsfTrack.hitPattern().numberOfLostHits('MISSING_INNER_HITS') <= 0 && (abs(superCluster.eta) <= 1.4442 || abs(superCluster.eta) >= 1.5660) && " + EletightIsoCut),
179179
# min = cms.int32(1),
180180
# max = cms.int32(1),
181181
# ),*/
182182
cms.PSet(
183183
label = cms.string("elecs/pf:step0"),
184-
src = cms.InputTag("pfIsolatedElectronsEI"),
185-
select = cms.string("pt>20 & abs(eta)<2.5 & (abs(gsfElectronRef.superCluster().eta()) <= 1.4442 || abs(gsfElectronRef.superCluster().eta()) >= 1.5660) &&" + tightEleCut),
184+
src = cms.InputTag("gedGsfElectrons"),
185+
select = cms.string("pt>20 & abs(eta)<2.5 & (abs(superCluster().eta()) <= 1.4442 || abs(superCluster().eta()) >= 1.5660) &&" + tightEleCut),
186186
min = cms.int32(1),
187187
),
188188
cms.PSet(

0 commit comments

Comments
 (0)