[NGT] Backport - Implement new strategy for Tau Validation at HLT and RECO in Phase-2

Configuration/EventContent/python/EventContent_cff.py

@@ -741,6 +741,7 @@ def SwapKeepAndDrop(l):
                            'keep *_hltPFMET_*_*',
                            'keep *_hltPFPuppiMET_*_*',
                            'keep *_hltPFPuppiMETTypeOne_*_*',
+                           'keep *_hltHpsPFTauDeepTauProducer_*_*'
                        ])
 
 phase2_muon.toModify(FEVTDEBUGHLTEventContent, 

HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py

@@ -43,7 +43,7 @@
 
 # Temporary Phase-2 configuration
 # Exclude everything except JetMET for now
-_phase2_hltpostvalidation =  hltpostvalidation.copyAndExclude([HLTTauPostVal,
+_phase2_hltpostvalidation =  hltpostvalidation.copyAndExclude([#HLTTauPostVal,
                                                                EgammaPostVal,
                                                                heavyFlavorValidationHarvestingSequence,
                                                                #HLTJetMETPostVal,

HLTriggerOffline/Common/python/HLTValidation_cff.py

@@ -75,6 +75,9 @@
 # Add HGCal SimTracksters
 _phase2_hltassociation += hltTiclSimTrackstersSeq
 
+# Add gentau reference for validation
+_phase2_hltassociation += tauPreValidSeq
+
 # Apply the modification
 phase2_common.toReplaceWith(hltassociation, _phase2_hltassociation)
 
@@ -102,7 +105,7 @@
 
 # Exclude everything except Muon and JetMET for now. Add HGCAL Hit Calibration
 _hltvalidationWithMC_Phase2 = hltvalidationWithMC.copyAndExclude([#HLTMuonVal,
-  HLTTauVal,
+  #HLTTauVal,
   egammaValidationSequence,
   heavyFlavorValidationSequence,
   #HLTJetMETValSeq,
@@ -117,7 +120,7 @@
   hltHCALNoiseRates])
 _hltvalidationWithMC_Phase2.insert(-1, hgcalHitCalibrationHLT)
 _hltvalidationWithMC_Phase2.insert(-1, hltHgcalValidator)
-_hltvalidationWithMC_Phase2.insert(-1, hltGENValidation)
+_hltvalidationWithMC_Phase2.insert(0, hltGENValidation)
 phase2_common.toReplaceWith(hltvalidationWithMC, _hltvalidationWithMC_Phase2)
 
 hltvalidationWithData = cms.Sequence(

HLTriggerOffline/Tau/python/Validation/HLTTauPostValidation_cfi.py

@@ -1,15 +1,21 @@
 import FWCore.ParameterSet.Config as cms
 
 from HLTriggerOffline.Tau.Validation.HLTTauValidation_cfi import *
+from Validation.RecoTau.hltTauPostProcessor_cff import *
 import DQMOffline.Trigger.HLTTauPostProcessor_cfi as postProcessor
 
 (HLTTauValPostAnalysisMC, HLTTauValPostAnalysisMC2) = postProcessor.makePFTauAnalyzer(hltTauValIdealMonitorMC)
 (HLTTauValPostAnalysisPF, HLTTauValPostAnalysisPF2) = postProcessor.makePFTauAnalyzer(hltTauValIdealMonitorPF)
 (HLTTauValPostAnalysisPN, HLTTauValPostAnalysisPN2) = postProcessor.makePFTauAnalyzer(hltTauValIdealMonitorPNet)
 (HLTTauValPostAnalysisTP, HLTTauValPostAnalysisTP2) = postProcessor.makePFTauAnalyzer(hltTauValTagAndProbe)
+
 HLTTauPostVal = cms.Sequence(
     HLTTauValPostAnalysisMC+HLTTauValPostAnalysisMC2+
     HLTTauValPostAnalysisPF+HLTTauValPostAnalysisPF2+
     HLTTauValPostAnalysisPN+HLTTauValPostAnalysisPN2+
     HLTTauValPostAnalysisTP+HLTTauValPostAnalysisTP2
 )
+HLTTauPostValPhase2 = cms.Sequence(hltTauPostProcessor)
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(HLTTauPostVal, HLTTauPostValPhase2)

HLTriggerOffline/Tau/python/Validation/HLTTauValidation_cff.py

@@ -2,5 +2,10 @@
 
 from HLTriggerOffline.Tau.Validation.HLTTauReferences_cfi import *
 from HLTriggerOffline.Tau.Validation.HLTTauValidation_cfi import *
+from Validation.RecoTau.hltTauValidation_cff import *
 
-HLTTauVal    = cms.Sequence(hltTauRef+hltTauValIdeal)
+HLTTauVal       = cms.Sequence(hltTauRef+hltTauValIdeal)
+HLTTauValPhase2 = cms.Sequence(hltTauValidationSequence)
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(HLTTauVal, HLTTauValPhase2)

HLTriggerOffline/Tau/python/Validation/HLTTauValidation_cfi.py

@@ -100,4 +100,3 @@
 
 #hltTauValIdeal = cms.Sequence(hltTauValIdealMonitorMC+hltTauValIdealMonitorPF)
 hltTauValIdeal = cms.Sequence(hltTauValIdealMonitorMC+hltTauValIdealMonitorPF+hltTauValIdealMonitorPNet+hltTauValTagAndProbe)
-

Validation/Configuration/python/autoValidation.py

@@ -7,7 +7,7 @@
                    'JetMETOnlyValidation' : ['globalPrevalidationJetMETOnly','globalValidationJetMETonly','postValidation_JetMET'],
                    'electronOnlyValidation' : ['', 'electronValidationSequence', 'electronPostValidationSequence'],
                    'photonOnlyValidation' : ['', 'photonValidationSequence', 'photonPostProcessor'],
-                   'tauOnlyValidation' : ['produceDenoms', 'pfTauRunDQMValidation', 'runTauEff'],
+                   'tauOnlyValidation' : ['globalPrevalidationTaus', 'globalValidationTaus', 'postValidationTaus'],
                    'ecalOnlyValidation' : ['globalPrevalidationECALOnly','globalValidationECALOnly','postValidation_ECAL'],
                    'hcalValidation' : ['globalPrevalidationHCAL','globalValidationHCAL','postValidation_HCAL'],
                    'hcalOnlyValidation' : ['globalPrevalidationHCALOnly','globalValidationHCALOnly','postValidation_HCAL'],

Validation/Configuration/python/globalValidation_cff.py

@@ -38,6 +38,7 @@
 from Validation.DTRecHits.DTRecHitQuality_cfi import *
 from Validation.CSCRecHits.cscRecHitValidation_cfi import *
 from Validation.RecoTau.DQMMCValidation_cfi import *
+from Validation.RecoTau.RecoTauValidation_cff import *
 from Validation.L1T.L1Validator_cfi import *
 from Validation.SiPixelPhase1ConfigV.SiPixelPhase1OfflineDQM_sourceV_cff import *
 from DQMOffline.RecoB.dqmAnalyzer_cff import *
@@ -152,6 +153,16 @@
     + metPreValidSeq
 )
 
+globalPrevalidationTaus = cms.Sequence(
+    # produceDenoms
+    tauPreValidSeq
+)
+
+globalValidationTaus = cms.Sequence(
+    # pfTauRunDQMValidation
+    recoTauValidationSequence
+)
+
 # ECAL local reconstruction
 globalPrevalidationECAL = cms.Sequence()
 globalPrevalidationECALOnly = cms.Sequence(

Validation/Configuration/python/postValidation_cff.py

@@ -17,6 +17,7 @@
 from Validation.RecoParticleFlow.PFValidationClient_cff import *
 from Validation.RPCRecHits.postValidation_cfi import *
 from Validation.RecoTau.DQMMCValidation_cfi import *
+from Validation.RecoTau.RecoTauPostProcessor_cff import *
 from Validation.RecoVertex.PostProcessorVertex_cff import *
 from Validation.RecoMET.METPostProcessor_cff import *
 from Validation.L1T.postProcessorL1Gen_cff import *
@@ -47,7 +48,6 @@
     + MuonCSCDigisPostProcessors
 )
 
-effPlotting = cms.Sequence(runTauEff + makeBetterPlots) #test
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 
 postValidation_preprod = cms.Sequence(
@@ -95,6 +95,11 @@
     METPostProcessor
 )
 
+postValidationTaus = cms.Sequence(
+    # runTauEff
+    RecoTauPostProcessor
+)
+
 postValidation_ECAL = cms.Sequence()
 
 postValidation_HCAL = cms.Sequence(