Skip to content

Commit

Permalink
drop type specs in Validation/RecoParticleFlow
Browse files Browse the repository at this point in the history
  • Loading branch information
hatakeyamak committed Jul 5, 2021
1 parent 47df2fa commit e47f41e
Show file tree
Hide file tree
Showing 10 changed files with 155 additions and 155 deletions.
4 changes: 2 additions & 2 deletions Validation/RecoParticleFlow/python/PFClusterValidation_cff.py
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Validation.RecoParticleFlow.pfClusterValidation_cfi import pfClusterValidation

pfClusterValidationSequence = cms.Sequence( pfClusterValidation )

pfClusterCaloOnlyValidation = pfClusterValidation.clone(
pflowClusterHCAL = 'particleFlowClusterHCALOnly',
pflowClusterHCAL = 'particleFlowClusterHCALOnly'
)

pfClusterCaloOnlyValidationSequence = cms.Sequence( pfClusterCaloOnlyValidation )
14 changes: 8 additions & 6 deletions Validation/RecoParticleFlow/python/PFElectronValidation_cff.py
Expand Up @@ -16,14 +16,16 @@
)


pfElectronValidation1 = pfElectronDQMAnalyzer.clone()
pfElectronValidation1.BenchmarkLabel = cms.string('PFElectronValidation/CompWithGenElectron')
pfElectronValidation1 = pfElectronDQMAnalyzer.clone(
BenchmarkLabel = 'PFElectronValidation/CompWithGenElectron'
)
pfElectronValidationSequence = cms.Sequence( gensource + pfElectronValidation1 )


# NoTracking
pfElectronValidation2 = pfElectronDQMAnalyzer.clone()
pfElectronValidation2.InputCollection = cms.InputTag('pfAllElectrons','','PFlowDQMnoTracking')
pfElectronValidation2.MatchCollection = cms.InputTag('gensource','','PFlowDQMnoTracking')
pfElectronValidation2.BenchmarkLabel = cms.string('PFElectronValidation/CompWithGenElectron')
pfElectronValidation2 = pfElectronDQMAnalyzer.clone(
InputCollection = 'pfAllElectrons::PFlowDQMnoTracking',
MatchCollection = 'gensource::PFlowDQMnoTracking',
BenchmarkLabel = 'PFElectronValidation/CompWithGenElectron'
)
pfElectronValidationSequence_NoTracking = cms.Sequence( pfElectronValidation2 )
19 changes: 10 additions & 9 deletions Validation/RecoParticleFlow/python/PFJetResValidation_cff.py
Expand Up @@ -2,16 +2,17 @@

from DQMOffline.PFTau.PFJetResDQMAnalyzer_cfi import pfJetResDQMAnalyzer

pfJetResValidation1 = pfJetResDQMAnalyzer.clone()
pfJetResValidation1.InputCollection = cms.InputTag('ak4PFJets') # for global Validation
pfJetResValidation1.MatchCollection = cms.InputTag('ak4GenJets') # for global Validatio
pfJetResValidation1.BenchmarkLabel = cms.string('ElectronValidation/JetPtRes')
pfJetResValidation1 = pfJetResDQMAnalyzer.clone(
InputCollection = 'ak4PFJets', # for global Validation
MatchCollection = 'ak4GenJets', # for global Validatio
BenchmarkLabel = 'PFJetResValidation/JetPtRes'
)
pfJetResValidationSequence = cms.Sequence( pfJetResValidation1 )

# NoTracking
pfJetResValidation2 = pfJetResDQMAnalyzer.clone()
pfJetResValidation2.InputCollection = cms.InputTag('ak4PFJets','','PFlowDQMnoTracking')
pfJetResValidation2.MatchCollection = cms.InputTag('ak4GenJets','','PFlowDQMnoTracking')
pfJetResValidation2.BenchmarkLabel = cms.string('ElectronValidation/JetPtResNoTracking')
pfJetResValidation2 = pfJetResDQMAnalyzer.clone(
InputCollection = 'ak4PFJets::PFlowDQMnoTracking',
MatchCollection = 'ak4GenJets::PFlowDQMnoTracking',
BenchmarkLabel = 'PFJetResValidation/JetPtResNoTracking'
)
pfJetResValidationSequence_NoTracking = cms.Sequence( pfJetResValidation2 )

20 changes: 10 additions & 10 deletions Validation/RecoParticleFlow/python/PFJetValidation_cff.py
@@ -1,17 +1,17 @@
import FWCore.ParameterSet.Config as cms


from DQMOffline.PFTau.PFJetDQMAnalyzer_cfi import pfJetDQMAnalyzer

pfJetValidation1 = pfJetDQMAnalyzer.clone()
pfJetValidation1.InputCollection = cms.InputTag('ak4PFJets')
pfJetValidation1.MatchCollection = cms.InputTag('ak4GenJets')
pfJetValidation1.BenchmarkLabel = cms.string('PFJetValidation/CompWithGenJet')
pfJetValidation1 = pfJetDQMAnalyzer.clone(
InputCollection = 'ak4PFJets',
MatchCollection = 'ak4GenJets',
BenchmarkLabel = 'PFJetValidation/CompWithGenJet'
)

pfJetValidation2 = pfJetDQMAnalyzer.clone()
pfJetValidation2.InputCollection = cms.InputTag('ak4PFJets')
pfJetValidation2.MatchCollection = cms.InputTag('ak4CaloJets')
pfJetValidation2.BenchmarkLabel = cms.string('PFJetValidation/CompWithCaloJet')
pfJetValidation2 = pfJetDQMAnalyzer.clone(
InputCollection = 'ak4PFJets',
MatchCollection = 'ak4CaloJets',
BenchmarkLabel = 'PFJetValidation/CompWithCaloJet'
)

pfJetValidationSequence = cms.Sequence( pfJetValidation1 * pfJetValidation2 )

19 changes: 10 additions & 9 deletions Validation/RecoParticleFlow/python/PFMETValidation_cff.py
@@ -1,16 +1,17 @@
import FWCore.ParameterSet.Config as cms


from DQMOffline.PFTau.PFMETDQMAnalyzer_cfi import pfMETDQMAnalyzer

pfMETValidation1 = pfMETDQMAnalyzer.clone()
pfMETValidation1.InputCollection = cms.InputTag('pfMet')
pfMETValidation1.MatchCollection = cms.InputTag('genMetTrue')
pfMETValidation1.BenchmarkLabel = cms.string('PFMETValidation/CompWithGenMET')
pfMETValidation1 = pfMETDQMAnalyzer.clone(
InputCollection = 'pfMet',
MatchCollection = 'genMetTrue',
BenchmarkLabel = 'PFMETValidation/CompWithGenMET'
)

pfMETValidation2 = pfMETDQMAnalyzer.clone()
pfMETValidation2.InputCollection = cms.InputTag('pfMet')
pfMETValidation2.MatchCollection = cms.InputTag('caloMet')
pfMETValidation2.BenchmarkLabel = cms.string('PFMETValidation/CompWithCaloMET')
pfMETValidation2 = pfMETDQMAnalyzer.clone(
InputCollection = 'pfMet',
MatchCollection = 'caloMet',
BenchmarkLabel = 'PFMETValidation/CompWithCaloMET'
)

pfMETValidationSequence = cms.Sequence( pfMETValidation1 * pfMETValidation2 )
23 changes: 11 additions & 12 deletions Validation/RecoParticleFlow/python/PFMuonValidation_cff.py
@@ -1,18 +1,17 @@
import FWCore.ParameterSet.Config as cms


from DQMOffline.Muon.muonPFAnalyzer_cfi import muonPFsequence

muonPFsequenceMC = muonPFsequence.clone()
muonPFsequenceMC.inputTagMuonReco = cms.InputTag("muons")
muonPFsequenceMC.inputTagGenParticles = cms.InputTag("genParticles")
muonPFsequenceMC.inputTagVertex = cms.InputTag("offlinePrimaryVertices")
muonPFsequenceMC.inputTagBeamSpot = cms.InputTag("offlineBeamSpot")
muonPFsequenceMC.runOnMC = cms.bool(True)
muonPFsequenceMC.folder = cms.string("ParticleFlow/PFMuonValidation/")
muonPFsequenceMC.recoGenDeltaR = cms.double(0.1)
muonPFsequenceMC.relCombIsoCut = cms.double(0.15)
muonPFsequenceMC.highPtThreshold = cms.double(200.)
muonPFsequenceMC = muonPFsequence.clone(
inputTagMuonReco = "muons",
inputTagGenParticles = "genParticles",
inputTagVertex = "offlinePrimaryVertices",
inputTagBeamSpot = "offlineBeamSpot",
runOnMC = True,
folder = 'ParticleFlow/PFMuonValidation/',
recoGenDeltaR = 0.1,
relCombIsoCut = 0.15,
highPtThreshold = 200.
)

pfMuonValidationSequence = cms.Sequence( muonPFsequenceMC )

63 changes: 31 additions & 32 deletions Validation/RecoParticleFlow/python/PFValidationClient_cff.py
@@ -1,34 +1,33 @@
import FWCore.ParameterSet.Config as cms

#from DQMOffline.PFTau.PFClient_cfi import pfClient
from DQMOffline.PFTau.PFClient_cfi import *

pfJetClient = pfClient.clone()
pfJetClient.FolderNames = cms.vstring("PFJetValidation/CompWithGenJet")
pfJetClient.HistogramNames = cms.vstring( "delta_et_Over_et_VS_et_")
pfJetClient.CreateProfilePlots = cms.bool(True)
pfJetClient.HistogramNamesForProfilePlots = cms.vstring("delta_et_Over_et_VS_et_","delta_et_VS_et_","delta_eta_VS_et_","delta_phi_VS_et_")

pfMETClient = pfClient.clone()
pfMETClient.FolderNames = cms.vstring("PFMETValidation/CompWithGenMET")
pfMETClient.HistogramNames = cms.vstring( "delta_et_Over_et_VS_et_")
pfMETClient.CreateProfilePlots = cms.bool(True)
pfMETClient.HistogramNamesForProfilePlots = cms.vstring("delta_et_Over_et_VS_et_","delta_et_VS_et_","delta_eta_VS_et_","delta_phi_VS_et_")

pfJetResClient = pfClientJetRes.clone()
pfJetResClient.FolderNames = cms.vstring("ElectronValidation/JetPtRes")
pfJetResClient.HistogramNames = cms.vstring("delta_et_Over_et_VS_et_", "BRdelta_et_Over_et_VS_et_", "ERdelta_et_Over_et_VS_et_")
#pfJetResClient.HistogramNames = cms.vstring("") # use this if slicingOn is true in PFJetResDQMAnalyzer
pfJetResClient.CreateEfficiencyPlots = cms.bool(False)
pfJetResClient.HistogramNamesForEfficiencyPlots = cms.vstring("pt_", "eta_", "phi_")

pfElectronClient = pfClient.clone()
pfElectronClient.FolderNames = cms.vstring("PFElectronValidation/CompWithGenElectron")
#pfElectronClient.HistogramNames = cms.vstring("delta_et_Over_et_VS_et_")
pfElectronClient.HistogramNames = cms.vstring("")
pfElectronClient.CreateEfficiencyPlots = cms.bool(True)
pfElectronClient.HistogramNamesForEfficiencyPlots = cms.vstring("pt_", "eta_", "phi_")

pfElectronClient.HistogramNamesForProjectionPlots = cms.vstring("delta_et_Over_et_VS_et_","delta_et_VS_et_","delta_eta_VS_et_","delta_phi_VS_et_")


from DQMOffline.PFTau.PFClient_cfi import pfClient, pfClientJetRes
#from DQMOffline.PFTau.PFClient_cfi import *

pfJetClient = pfClient.clone(
FolderNames = ['PFJetValidation/CompWithGenJet'],
HistogramNames = ['delta_et_Over_et_VS_et_'],
CreateProfilePlots = True,
HistogramNamesForProfilePlots = ['delta_et_Over_et_VS_et_','delta_et_VS_et_','delta_eta_VS_et_','delta_phi_VS_et_']
)

pfMETClient = pfClient.clone(
FolderNames = ['PFMETValidation/CompWithGenMET'],
HistogramNames = ['delta_et_Over_et_VS_et_'],
CreateProfilePlots = True,
HistogramNamesForProfilePlots = ['delta_et_Over_et_VS_et_','delta_et_VS_et_','delta_eta_VS_et_','delta_phi_VS_et_']
)

pfJetResClient = pfClientJetRes.clone(
FolderNames = ['PFJetResValidation/JetPtRes'],
HistogramNames = ['delta_et_Over_et_VS_et_', 'BRdelta_et_Over_et_VS_et_', 'ERdelta_et_Over_et_VS_et_'],
CreateEfficiencyPlots = False,
HistogramNamesForEfficiencyPlots = ['pt_', 'eta_', 'phi_']
)

pfElectronClient = pfClient.clone(
FolderNames = ['PFElectronValidation/CompWithGenElectron'],
HistogramNames = [''],
CreateEfficiencyPlots = True,
HistogramNamesForEfficiencyPlots = ['pt_', 'eta_', 'phi_'],
HistogramNamesForProjectionPlots = ['delta_et_Over_et_VS_et_','delta_et_VS_et_','delta_eta_VS_et_','delta_phi_VS_et_']
)
118 changes: 57 additions & 61 deletions Validation/RecoParticleFlow/python/miniAODDQM_cff.py
Expand Up @@ -3,90 +3,86 @@
# jet
from DQMOffline.PFTau.PFJetDQMAnalyzer_cfi import pfJetDQMAnalyzer

JetValidation1 = pfJetDQMAnalyzer.clone()
JetValidation1.BenchmarkLabel = cms.string('slimmedJetValidation/CompWithPFJets')
JetValidation1.InputCollection = cms.InputTag('slimmedJets')
JetValidation1.MatchCollection = cms.InputTag('ak4PFJetsCHS') # ak5PFJetsCHS # ak5PFJets
JetValidation1.ptMin = cms.double(10.0)
JetValidation1.CreatePFractionHistos = cms.bool(True)
#JetValidation1.InputCollection = cms.InputTag('ak5PFJets')
#JetValidation1.MatchCollection = cms.InputTag('slimmedJets')

JetValidation2 = pfJetDQMAnalyzer.clone()
JetValidation2.BenchmarkLabel = cms.string('slimmedJetValidation/CompWithPFJetsEC')
#JetValidation2.InputCollection = JetValidation1.MatchCollection
#JetValidation2.MatchCollection = JetValidation1.InputCollection
JetValidation2.InputCollection = cms.InputTag('slimmedJets')
JetValidation2.MatchCollection = cms.InputTag('ak4PFJetsNewL1Fast23') # ak4PFJetsCHSEC # ak4PFJetsCHS
JetValidation2.ptMin = JetValidation1.ptMin
JetValidation2.CreatePFractionHistos = cms.bool(True)
slimmedJetValidation1 = pfJetDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedJetValidation/CompWithPFJets',
InputCollection = 'slimmedJets',
MatchCollection = 'ak4PFJetsCHS', # ak5PFJetsCHS # ak5PFJets
ptMin = 10.0,
CreatePFractionHistos = True
#InputCollection = 'ak5PFJets'
#MatchCollection = 'slimmedJets'
)

slimmedJetValidation2 = pfJetDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedJetValidation/CompWithPFJetsEC',
#InputCollection = JetValidation1.MatchCollection
#MatchCollection = JetValidation1.InputCollection
InputCollection = 'slimmedJets',
MatchCollection = 'ak4PFJetsNewL1Fast23', # ak4PFJetsCHSEC # ak4PFJetsCHS
ptMin = slimmedJetValidation1.ptMin,
CreatePFractionHistos = True
)


# jetRes plots
from DQMOffline.PFTau.PFJetResDQMAnalyzer_cfi import pfJetResDQMAnalyzer

JetResValidation1 = pfJetResDQMAnalyzer.clone()
JetResValidation1.InputCollection = JetValidation1.InputCollection
JetResValidation1.MatchCollection = JetValidation1.MatchCollection
JetResValidation1.ptMin = JetValidation1.ptMin
slimmedJetResValidation1 = pfJetResDQMAnalyzer.clone(
InputCollection = slimmedJetValidation1.InputCollection,
MatchCollection = slimmedJetValidation1.MatchCollection,
ptMin = slimmedJetValidation1.ptMin
)

JetResValidation2 = pfJetResDQMAnalyzer.clone()
JetResValidation2.InputCollection = JetValidation2.InputCollection
JetResValidation2.MatchCollection = JetValidation2.MatchCollection
JetResValidation2.ptMin = JetValidation2.ptMin
slimmedJetResValidation2 = pfJetResDQMAnalyzer.clone(
InputCollection = slimmedJetValidation2.InputCollection,
MatchCollection = slimmedJetValidation2.MatchCollection,
ptMin = slimmedJetValidation2.ptMin
)


# MET
from DQMOffline.PFTau.PFMETDQMAnalyzer_cfi import pfMETDQMAnalyzer

METValidation1 = pfMETDQMAnalyzer.clone()
METValidation1.BenchmarkLabel = cms.string('slimmedMETValidation/CompWithPFMET')
METValidation1.InputCollection = cms.InputTag('slimmedMETs')
METValidation1.MatchCollection = cms.InputTag('pfMet')
slimmedMETValidation1 = pfMETDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedMETValidation/CompWithPFMET',
InputCollection = 'slimmedMETs',
MatchCollection = 'pfMet'
)

METValidation2 = pfMETDQMAnalyzer.clone()
METValidation2.BenchmarkLabel = cms.string('slimmedMETValidation/CompWithPFMETT1')
METValidation2.InputCollection = cms.InputTag('slimmedMETs')
METValidation2.MatchCollection = cms.InputTag('pfMetT1')
slimmedMETValidation2 = pfMETDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedMETValidation/CompWithPFMETT1',
InputCollection = 'slimmedMETs',
MatchCollection = 'pfMetT1'
)


# muons
from DQMOffline.PFTau.PFMuonDQMAnalyzer_cfi import pfMuonDQMAnalyzer

slimmedMuonValidation1 = pfMuonDQMAnalyzer.clone()
slimmedMuonValidation1.BenchmarkLabel = cms.string('SlimmedMuonValidation/CompWithRecoMuons')
slimmedMuonValidation1.InputCollection = cms.InputTag('slimmedMuons')
slimmedMuonValidation1.MatchCollection = cms.InputTag('muons')
# official
#muonPFsequenceMC.inputTagMuonReco = cms.InputTag('slimmedMuons')
#muonPFsequenceMC.inputTagGenParticles = cms.InputTag('muons')
#muonPFsequenceMC.runOnMC = cms.bool(False)
# RefCore: A request to resolve a reference to a product of type 'std::vector<reco::Track>' with ProductID '3:1469' can not be satisfied because the product cannot be found.
# with the following:
#muonPFsequenceMC.inputTagMuonReco = cms.InputTag('muons')
#muonPFsequenceMC.inputTagGenParticles = cms.InputTag('slimmedMuons')
slimmedMuonValidation1 = pfMuonDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedMuonValidation/CompWithRecoMuons',
InputCollection = 'slimmedMuons',
MatchCollection = 'muons'
)


# electrons
from DQMOffline.PFTau.PFElectronDQMAnalyzer_cfi import pfElectronDQMAnalyzer

ElectronValidation1 = pfElectronDQMAnalyzer.clone()
ElectronValidation1.BenchmarkLabel = cms.string('slimmedElectronValidation/CompWithGedGsfElectrons')
ElectronValidation1.InputCollection = cms.InputTag('slimmedElectrons')
ElectronValidation1.MatchCollection = cms.InputTag('gedGsfElectrons')
# use electrons plots for muons
#ElectronValidation2 = pfElectronDQMAnalyzer.clone()
#ElectronValidation2.BenchmarkLabel = slimmedMuonValidation1.BenchmarkLabel
#ElectronValidation2.InputCollection = slimmedMuonValidation1.InputCollection
#ElectronValidation2.MatchCollection = slimmedMuonValidation1.MatchCollection
slimmedElectronValidation1 = pfElectronDQMAnalyzer.clone(
BenchmarkLabel = 'slimmedElectronValidation/CompWithGedGsfElectrons',
InputCollection = 'slimmedElectrons',
MatchCollection = 'gedGsfElectrons'
)


from JetMETCorrections.Type1MET.pfMETCorrectionType0_cfi import type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD

miniAODDQMSequence = cms.Sequence(
type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD *
JetValidation1 * JetValidation2 *
JetResValidation1 * JetResValidation2 *
METValidation1 * METValidation2 *
slimmedMuonValidation1 *
ElectronValidation1
)
type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD *
slimmedJetValidation1 * slimmedJetValidation2 *
slimmedJetResValidation1 * slimmedJetResValidation2 *
slimmedMETValidation1 * slimmedMETValidation2 *
slimmedMuonValidation1 *
slimmedElectronValidation1
)
23 changes: 12 additions & 11 deletions Validation/RecoParticleFlow/python/miniAODValidation_cff.py
Expand Up @@ -2,19 +2,20 @@

# genParticles
genParticles1 = cms.EDProducer("GenParticlePruner",
src = cms.InputTag("genParticles"),
select = cms.vstring('drop *',
# for miniAOD matching
'keep status == 1')
)
src = cms.InputTag("genParticles"),
select = cms.vstring('drop *',
# for miniAOD matching
'keep status == 1')
)

from DQMOffline.PFTau.PFElectronDQMAnalyzer_cfi import pfElectronDQMAnalyzer

genParticlesValidation = pfElectronDQMAnalyzer.clone()
genParticlesValidation.BenchmarkLabel = cms.string('packedGenParticlesValidation/CompWithGenParticles')
genParticlesValidation.InputCollection = cms.InputTag('packedGenParticles')
genParticlesValidation.MatchCollection = cms.InputTag('genParticles1')
genParticlesValidation = pfElectronDQMAnalyzer.clone(
BenchmarkLabel = 'packedGenParticlesValidation/CompWithGenParticles',
InputCollection = 'packedGenParticles',
MatchCollection = 'genParticles1'
)

miniAODValidationSequence = cms.Sequence(
genParticlesValidation
)
genParticlesValidation
)

0 comments on commit e47f41e

Please sign in to comment.