Skip to content

Commit

Permalink
migrate hlt validation to fastsim era
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukas committed Nov 12, 2015
1 parent 7ad8473 commit 18b295d
Show file tree
Hide file tree
Showing 44 changed files with 42 additions and 1,232 deletions.
2 changes: 1 addition & 1 deletion FastSimulation/Configuration/python/Harvesting_cff.py
View file
Expand Up @@ -4,7 +4,7 @@
from Validation.Configuration.postValidation_cff import *

HarvestingFastSim = cms.Sequence(postValidation_fastsim
+ hltpostvalidation_fastsim)
+ hltpostvalidation)

HarvestingFastSim_preprod = cms.Sequence(postValidation_fastsim
+ hltpostvalidation_preprod)
Expand Down
6 changes: 3 additions & 3 deletions FastSimulation/Configuration/python/Validation_cff.py
View file
Expand Up @@ -6,9 +6,9 @@
from Validation.RecoMET.METRelValForDQM_cff import metPreValidSeq
from Validation.RecoJets.JetValidation_cff import jetPreValidSeq

prevalidation = cms.Sequence(globalPrevalidation+hltassociation_fastsim+metPreValidSeq+jetPreValidSeq)
prevalidation = cms.Sequence(globalPrevalidation+hltassociation+metPreValidSeq+jetPreValidSeq)
prevalidation_preprod = cms.Sequence(globalPrevalidation)
prevalidation_prod = cms.Sequence(globalPrevalidation)
validation = cms.Sequence(basicGenTest_seq+globalValidation+hltvalidation_fastsim+dqmPhysics)
validation_preprod = cms.Sequence(basicGenTest_seq+globalValidation_preprod+hltvalidation_preprod_fastsim)
validation = cms.Sequence(basicGenTest_seq+globalValidation+hltvalidation+dqmPhysics)
validation_preprod = cms.Sequence(basicGenTest_seq+globalValidation_preprod+hltvalidation_preprod)
validation_prod = cms.Sequence(basicGenTest_seq+hltvalidation_prod)
34 changes: 0 additions & 34 deletions HLTriggerOffline/Btag/python/HltBtagValidationFastSim_cff.py
View file

This file was deleted.

20 changes: 20 additions & 0 deletions HLTriggerOffline/Btag/python/HltBtagValidation_cff.py
View file
Expand Up @@ -75,3 +75,23 @@
hltbTagValidation
)

# fastsim customs
from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
HltVertexValidationVertices.SimVertexCollection = cms.InputTag("famosSimHits")
# are these customs actually needed?
#HltVertexValidationVertices.HLTPathNames =cms.vstring(
#'HLT_PFMET120_NoiseCleaned_BTagCSV07_v',
#'HLT_PFMET120_NoiseCleaned_BTagCSV07_v',
# 'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDLoose_',
# 'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDLoose_',
# 'HLT_QuadPFJet_VBF',
# 'HLT_QuadPFJet_VBF',
# 'HLT_Ele32_eta2p1_',
# 'HLT_IsoMu24_eta2p1_')
#HltVertexValidationVertices.Vertex = cms.VInputTag(
# cms.InputTag("hltVerticesL3"),
# cms.InputTag("hltFastPVPixelVertices"),
# cms.InputTag("hltVerticesPF"),
#)

23 changes: 8 additions & 15 deletions HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py
View file
Expand Up @@ -36,21 +36,14 @@
+HltBTagPostVal
)

hltpostvalidation_fastsim = cms.Sequence(
HLTMuonPostVal_FastSim
+HLTTauPostVal
+EgammaPostVal
+topHLTriggerValidationHarvest
+heavyFlavorValidationHarvestingSequence
+JetMETPostVal
#+HLTAlCaPostVal
+SusyExoPostVal_fastsim
+HLTHiggsPostVal
+b2gHLTriggerValidationHarvest
+HLTSMPPostVal
+HltBTagPostVal
)

# fastsim customs
from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
hltpostvalidation.remove(postProcessorHLTtrackingSequence)
hltpostvalidation.remove(postProcessorHLTvertexing)
# remove this: +hltvalidationqt ?
# remove this: +hltExoticaPostProcessors ?

hltpostvalidation_preprod = cms.Sequence(
postProcessorHLTtrackingSequence
+postProcessorHLTvertexing
Expand Down
42 changes: 10 additions & 32 deletions HLTriggerOffline/Common/python/HLTValidation_cff.py
View file
Expand Up @@ -13,7 +13,6 @@
from HLTriggerOffline.Exotica.ExoticaValidation_cff import *
from HLTriggerOffline.SMP.SMPValidation_cff import *
from HLTriggerOffline.Btag.HltBtagValidation_cff import *
from HLTriggerOffline.Btag.HltBtagValidationFastSim_cff import *

# offline dqm:
# from DQMOffline.Trigger.DQMOffline_Trigger_cff.py import *
Expand All @@ -29,7 +28,6 @@
hltassociation = cms.Sequence( egammaSelectors
+ExoticaValidationProdSeq )


hltvalidation = cms.Sequence(
hltMultiTrackValidation
+hltMultiPVValidation
Expand All @@ -54,42 +52,20 @@
if eras.phase1Pixel.isChosen():
hltvalidation.remove(HiggsValidationSequence)

# additional producer sequence prior to hltvalidation_fastsim
# to evacuate producers from the EndPath
hltassociation_fastsim = cms.Sequence(
egammaSelectors
+ hltTauRef
)

hltvalidation_fastsim = cms.Sequence(
HLTMuonVal
+HLTTauValFS
+egammaValidationSequenceFS
+topHLTriggerOfflineDQM
+topHLTriggerValidation
+heavyFlavorValidationSequence
+HLTJetMETValSeq
#+HLTAlCaVal_FastSim
+HLTSusyExoValSeq_FastSim
+HiggsValidationSequence
+b2gHLTriggerValidation
+SMPValidationSequence
+hltbtagValidationSequenceFastSim
)
# some hlt collections have no direct fastsim equivalent
# remove the dependent modules for now
# probably it would be rather easy to add or fake these collections
from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
hltvalidation.remove(hltMultiTrackValidation)
hltvalidation.remove(hltMultiPVValidation)

hltvalidation_preprod = cms.Sequence(
HLTTauVal
+heavyFlavorValidationSequence
+HLTSusyExoValSeq
#+HiggsValidationSequence
)

hltvalidation_preprod_fastsim = cms.Sequence(
HLTTauVal
+heavyFlavorValidationSequence
+HLTSusyExoValSeq_FastSim
#+HiggsValidationSequence
)
)

hltvalidation_prod = cms.Sequence(
)
Expand All @@ -103,3 +79,5 @@
hltvalidation
+trigdqm_forValidation
)


1 change: 0 additions & 1 deletion HLTriggerOffline/Egamma/python/EgammaValidationAutoConf_cff.py
View file
Expand Up @@ -81,4 +81,3 @@ class dummy:

# selectors go into separate "prevalidation" sequence
egammaValidationSequence = cms.Sequence(emdqm)
egammaValidationSequenceFS = cms.Sequence(emdqm)
1 change: 0 additions & 1 deletion HLTriggerOffline/Egamma/python/EgammaValidation_cff.py
View file
Expand Up @@ -172,7 +172,6 @@ class dummy:

# selectors go into separate "prevalidation" sequence
egammaValidationSequence = cms.Sequence( egammaValidators )
egammaValidationSequenceFS = cms.Sequence( egammaValidators )

else:
#----------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py
View file
Expand Up @@ -53,6 +53,3 @@
resolution = cms.vstring('')
)

SUSY_HLT_Ele_HT_BTag_SingleLepton_FASTSIM = deepcopy(SUSY_HLT_Ele_HT_BTag_SingleLepton)

SUSY_HLT_Ele_HT_BTag_SingleLepton_FASTSIM_POSTPROCESSING = deepcopy(SUSY_HLT_Ele_HT_BTag_SingleLepton_POSTPROCESSING)
3 changes: 0 additions & 3 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_Control_SingleLepton_cff.py
View file
Expand Up @@ -51,6 +51,3 @@
resolution = cms.vstring('')
)

SUSY_HLT_Ele_HT_Control_SingleLepton_FASTSIM = deepcopy(SUSY_HLT_Ele_HT_Control_SingleLepton)

SUSY_HLT_Ele_HT_Control_SingleLepton_FASTSIM_POSTPROCESSING = deepcopy(SUSY_HLT_Ele_HT_Control_SingleLepton_POSTPROCESSING)
3 changes: 0 additions & 3 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_MET_SingleLepton_cff.py
View file
Expand Up @@ -52,6 +52,3 @@
resolution = cms.vstring('')
)

SUSY_HLT_Ele_HT_MET_SingleLepton_FASTSIM = deepcopy(SUSY_HLT_Ele_HT_MET_SingleLepton)

SUSY_HLT_Ele_HT_MET_SingleLepton_FASTSIM_POSTPROCESSING = deepcopy(SUSY_HLT_Ele_HT_MET_SingleLepton_POSTPROCESSING)
4 changes: 0 additions & 4 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_SingleLepton_cff.py
View file
Expand Up @@ -50,7 +50,3 @@
),
resolution = cms.vstring('')
)

SUSY_HLT_Ele_HT_SingleLepton_FASTSIM = deepcopy(SUSY_HLT_Ele_HT_SingleLepton)

SUSY_HLT_Ele_HT_SingleLepton_FASTSIM_POSTPROCESSING = deepcopy(SUSY_HLT_Ele_HT_SingleLepton_POSTPROCESSING)
31 changes: 0 additions & 31 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_HLT_Electron_BJet_cff.py
View file
Expand Up @@ -14,22 +14,6 @@
EtaThrJet = cms.untracked.double(3.0)
)


SUSY_HLT_Electron_BJet_FASTSIM = cms.EDAnalyzer("SUSY_HLT_Electron_BJet",
trigSummary = cms.InputTag("hltTriggerSummaryAOD",'', 'HLT'), #to use with test sample
ElectronCollection = cms.InputTag("gedGsfElectrons"),
pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
caloJetCollection = cms.InputTag("ak4CaloJets"),
TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
HLTProcess = cms.string('HLT'),
TriggerPath = cms.string('HLT_Ele10_CaloIdM_TrackIdM_CentralPFJet30_BTagCSV0p54PF_v'),
TriggerFilterEle = cms.InputTag('hltSingleEle10CaloIdTrackIdVLDphiFilter', '', 'HLT'), #the last filter in the path hltSingleEle10CaloIdTrackIdVLOneOEMinusOneOPFilterRegional
TriggerFilterJet = cms.InputTag('hltCSVFilterSingleEle10', '', 'HLT'), #the last filter in the path
PtThrJet = cms.untracked.double(40.0),
EtaThrJet = cms.untracked.double(3.0)
)


SUSY_HLT_Electron_BJet_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_DoubleEle8_CaloId_TrkIdVL_Mass8_PFHTT300"),
verbose = cms.untracked.uint32(2), # Set to 2 for all messages
Expand All @@ -39,18 +23,3 @@
"EleTurnOn_eff 'Turn-on vs Mu pT; pT (GeV); #epsilon' EleTurnOn_num EleTurnOn_den",
)
)


SUSY_HLT_Electron_BJet_FASTSIM_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_DoubleEle8_CaloId_TrkIdVL_Mass8_PFHTT300"),
verbose = cms.untracked.uint32(2), # Set to 2 for all messages
resolution = cms.vstring(""),
efficiency = cms.vstring(
"pfHTTurnOn_eff 'Turn-on vs HT; PFHT (GeV); #epsilon' pfHTTurnOn_num pfHTTurnOn_den",
"EleTurnOn_eff 'Turn-on vs Mu pT; pT (GeV); #epsilon' EleTurnOn_num EleTurnOn_den",
)
)




62 changes: 0 additions & 62 deletions HLTriggerOffline/SUSYBSM/python/SUSYBSM_HLT_HT_DoubleElectron_cff.py
View file
Expand Up @@ -34,43 +34,6 @@
EtaThrJet = cms.untracked.double(3.0)
)



SUSY_HLT_HT_DoubleEle_FASTSIM = cms.EDAnalyzer("SUSY_HLT_DoubleEle_Hadronic",
trigSummary = cms.InputTag("hltTriggerSummaryAOD",'', 'HLT'), #to use with test sample
#trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
ElectronCollection = cms.InputTag("gedGsfElectrons"),
pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
caloJetCollection = cms.InputTag("ak4CaloJets"),
TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
#TriggerResults = cms.InputTag('TriggerResults','','HLT'),
HLTProcess = cms.string('HLT'),
TriggerPath = cms.string('HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT300_v'),
TriggerPathAuxiliaryForElectron = cms.string('HLT_PFHT800_v'),
TriggerPathAuxiliaryForHadronic = cms.string('HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v'),
TriggerFilter = cms.InputTag('hltDoubleEle8Mass8Filter', '', 'HLT'), #the last filter in the path
PtThrJet = cms.untracked.double(40.0),
EtaThrJet = cms.untracked.double(3.0)
)

SUSY_HLT_HT250_DoubleEle_FASTSIM = cms.EDAnalyzer("SUSY_HLT_DoubleEle_Hadronic",
trigSummary = cms.InputTag("hltTriggerSummaryAOD",'', 'HLT'), #to use with test sample
#trigSummary = cms.InputTag("hltTriggerSummaryAOD"),
ElectronCollection = cms.InputTag("gedGsfElectrons"),
pfJetCollection = cms.InputTag("ak4PFJetsCHS"),
caloJetCollection = cms.InputTag("ak4CaloJets"),
TriggerResults = cms.InputTag('TriggerResults','','HLT'), #to use with test sample
#TriggerResults = cms.InputTag('TriggerResults','','HLT'),
HLTProcess = cms.string('HLT'),
TriggerPath = cms.string('HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT250_v'),
TriggerPathAuxiliaryForElectron = cms.string('HLT_PFHT800_v'),
TriggerPathAuxiliaryForHadronic = cms.string('HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v'),
TriggerFilter = cms.InputTag('hltDoubleEle8Mass8Filter', '', 'HLT'), #the last filter in the path
PtThrJet = cms.untracked.double(40.0),
EtaThrJet = cms.untracked.double(3.0)
)


SUSY_HLT_HT_DoubleEle_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT300"),
verbose = cms.untracked.uint32(2), # Set to 2 for all messages
Expand All @@ -90,28 +53,3 @@
"EleTurnOn_eff 'Turn-on vs Mu pT; pT (GeV); #epsilon' EleTurnOn_num EleTurnOn_den",
)
)


SUSY_HLT_HT_DoubleEle_FASTSIM_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT300"),
verbose = cms.untracked.uint32(2), # Set to 2 for all messages
resolution = cms.vstring(""),
efficiency = cms.vstring(
"pfHTTurnOn_eff 'Turn-on vs HT; PFHT (GeV); #epsilon' pfHTTurnOn_num pfHTTurnOn_den",
"EleTurnOn_eff 'Turn-on vs Mu pT; pT (GeV); #epsilon' EleTurnOn_num EleTurnOn_den",
)
)

SUSY_HLT_HT250_DoubleEle_FASTSIM_POSTPROCESSING = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/SUSYBSM/HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT2500"),
verbose = cms.untracked.uint32(2), # Set to 2 for all messages
resolution = cms.vstring(""),
efficiency = cms.vstring(
"pfHTTurnOn_eff 'Turn-on vs HT; PFHT (GeV); #epsilon' pfHTTurnOn_num pfHTTurnOn_den",
"EleTurnOn_eff 'Turn-on vs Mu pT; pT (GeV); #epsilon' EleTurnOn_num EleTurnOn_den",
)
)




0 comments on commit 18b295d

Please sign in to comment.