Merge pull request #10289 from JetMETdqmval/dqm_val_FIX_rebase_76X

fixes for running in unscheduled mode, rebase to 76X

Configuration/StandardSequences/python/Validation_cff.py

@@ -33,7 +33,7 @@
 prevalidation = cms.Sequence( globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq )
 prevalidationLiteTracking = cms.Sequence( prevalidation )
 prevalidationLiteTracking.replace(globalPrevalidation,globalPrevalidationLiteTracking)
-prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence * JetValidationMiniAOD * type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD )
+prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence * JetValidationMiniAOD * type0PFMEtCorrectionPFCandToVertexAssociationForValidationMiniAOD * METValidationMiniAOD )
 
 
 validation = cms.Sequence(cms.SequencePlaceholder("mix")

DQMOffline/JetMET/python/dataCertificationJetMET_cfi.py

@@ -26,7 +26,7 @@
                               metFolder      = cms.untracked.string("Cleaned"),
                               jetAlgo        = cms.untracked.string("ak4"),
                               folderName     = cms.untracked.string("JetMET/EventInfo"),  
-                              METTypeRECO    = cms.InputTag("pfMetT1"),
+                              METTypeRECO    = cms.InputTag("pfMETT1"),
                               METTypeMiniAOD = cms.InputTag("slimmedMETs"),
                               JetTypeRECO    = cms.InputTag("ak4PFJetsCHS"),
                               JetTypeMiniAOD = cms.InputTag("slimmedJets"),

DQMOffline/JetMET/python/jetAnalyzer_cfi.py

@@ -59,10 +59,10 @@
     JetIDVersion               = cms.string("PURE09"),
     #
     #actually done only for PFJets at the moment
-    InputMVAPUIDDiscriminant = cms.InputTag("pileupJetIdProducer","fullDiscriminant"),
-    InputCutPUIDDiscriminant = cms.InputTag("pileupJetIdProducer","cutbasedDiscriminant"),
-    InputMVAPUIDValue = cms.InputTag("pileupJetIdProducer","fullId"),
-    InputCutPUIDValue = cms.InputTag("pileupJetIdProducer","cutbasedId"),
+    InputMVAPUIDDiscriminant = cms.InputTag("pileupJetIdEvaluatorDQM","full53xDiscriminant"),
+    InputCutPUIDDiscriminant = cms.InputTag("pileupJetIdEvaluatorDQM","cutbasedDiscriminant"),
+    InputMVAPUIDValue = cms.InputTag("pileupJetIdEvaluatorDQM","full53xId"),
+    InputCutPUIDValue = cms.InputTag("pileupJetIdEvaluatorDQM","cutbasedId"),
 
     InputQGMultiplicity = cms.InputTag("QGTagger", "mult"),
     InputQGLikelihood = cms.InputTag("QGTagger", "qgLikelihood"),
@@ -137,12 +137,12 @@
     filljetHighLevel =cms.bool(True),
     JetCorrections = cms.InputTag("dqmAk4PFCHSL1FastL2L3ResidualCorrector"),
     jetsrc = cms.InputTag("ak4PFJetsCHS"),
-    METCollectionLabel     = cms.InputTag("pfMetT1"),
+    METCollectionLabel     = cms.InputTag("pfMETT1"),
     #actually done only for PFJets at the moment
-    InputMVAPUIDDiscriminant = cms.InputTag("pileupJetIdProducerChs","fullDiscriminant"),
-    InputCutPUIDDiscriminant = cms.InputTag("pileupJetIdProducerChs","cutbasedDiscriminant"),
-    InputMVAPUIDValue = cms.InputTag("pileupJetIdProducerChs","fullId"),
-    InputCutPUIDValue = cms.InputTag("pileupJetIdProducerChs","cutbasedId"),
+    InputMVAPUIDDiscriminant = cms.InputTag("pileupJetIdEvaluatorCHSDQM","fullDiscriminant"),
+    InputCutPUIDDiscriminant = cms.InputTag("pileupJetIdEvaluatorCHSDQM","cutbasedDiscriminant"),
+    InputMVAPUIDValue = cms.InputTag("pileupJetIdEvaluatorCHSDQM","fullId"),
+    InputCutPUIDValue = cms.InputTag("pileupJetIdEvaluatorCHSDQM","cutbasedId"),
     fillCHShistos =cms.bool(True),
 )
 

DQMOffline/JetMET/python/jetMETDQMOfflineSourceMC_cff.py

@@ -6,13 +6,37 @@
 from DQMOffline.JetMET.jetAnalyzer_cff   import *
 from DQMOffline.JetMET.SUSYDQMAnalyzer_cfi  import *
 from DQMOffline.JetMET.goodOfflinePrimaryVerticesDQM_cfi import *
-from RecoJets.JetProducers.PileupJetID_cfi  import *
 
+from RecoJets.JetProducers.pileupjetidproducer_cfi  import *
+from RecoJets.JetProducers.QGTagger_cfi  import *
 
-pileupJetIdProducer.jets = cms.InputTag("ak4PFJets")
-pileupJetIdProducer.algos = cms.VPSet(full_5x_chs,cutbased)
+pileupJetIdCalculatorDQM=pileupJetIdCalculator.clone(
+    jets = cms.InputTag("ak4PFJets"),
+    jec = cms.string("AK4PF"),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+)
+
+pileupJetIdEvaluatorDQM=pileupJetIdEvaluator.clone(
+    jets = cms.InputTag("ak4PFJets"),
+    jetids = cms.InputTag("pileupJetIdCalculatorDQM"),
+    algos = cms.VPSet(cms.VPSet(full_53x,cutbased)),
+    jec = cms.string("AK4PF"),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+)
+
+pileupJetIdCalculatorCHSDQM=pileupJetIdCalculator.clone(
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False),
+)
 
-pileupJetIdProducerChs.jets = cms.InputTag("ak4PFJetsCHS")
+pileupJetIdEvaluatorCHSDQM=pileupJetIdEvaluator.clone(
+    jetids = cms.InputTag("pileupJetIdCalculatorCHSDQM"),
+    algos = cms.VPSet(cms.VPSet(full_53x_chs,cutbased)),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+    )
 
 from JetMETCorrections.Configuration.JetCorrectors_cff import ak4CaloL2L3CorrectorChain,ak4CaloResidualCorrector,ak4CaloL2L3Corrector,ak4CaloL3AbsoluteCorrector,ak4CaloL2RelativeCorrector
 
@@ -46,22 +70,27 @@
 from JetMETCorrections.Type1MET.correctionTermsPfMetType0PFCandidate_cff import *
 from JetMETCorrections.Type1MET.correctionTermsPfMetType1Type2_cff import corrPfMetType1
 
-corrPfMetType1.jetCorrLabel = cms.InputTag('dqmAk4PFL1FastL2L3Corrector')
+dqmCorrPfMetType1=corrPfMetType1.clone(jetCorrLabel = cms.InputTag('dqmAk4PFL1FastL2L3Corrector'))
+pfMETT1=pfMetT1.clone(srcCorrections = cms.VInputTag(
+        cms.InputTag('dqmCorrPfMetType1', 'type1')
+    ))
 
-jetDQMAnalyzerAk4CaloUncleaned.JetCorrections  = cms.InputTag("dqmAk4CaloL2L3Corrector")
-jetDQMAnalyzerAk4CaloCleaned.JetCorrections    = cms.InputTag("dqmAk4CaloL2L3Corrector")
-jetDQMAnalyzerAk4PFUncleaned.JetCorrections    = cms.InputTag("dqmAk4PFL1FastL2L3Corrector")
-jetDQMAnalyzerAk4PFCleaned.JetCorrections      = cms.InputTag("dqmAk4PFL1FastL2L3Corrector")
-jetDQMAnalyzerAk4PFCHSCleaned.JetCorrections   = cms.InputTag("dqmAk4PFCHSL1FastL2L3Corrector")
+jetDQMAnalyzerAk4CaloUncleanedMC=jetDQMAnalyzerAk4CaloUncleaned.clone(JetCorrections  = cms.InputTag("dqmAk4CaloL2L3Corrector"))
+jetDQMAnalyzerAk4CaloCleanedMC=jetDQMAnalyzerAk4CaloCleaned.clone(JetCorrections    = cms.InputTag("dqmAk4CaloL2L3Corrector"))
+jetDQMAnalyzerAk4PFUncleanedMC=jetDQMAnalyzerAk4PFUncleaned.clone(JetCorrections    = cms.InputTag("dqmAk4PFL1FastL2L3Corrector"))
+jetDQMAnalyzerAk4PFCleanedMC=jetDQMAnalyzerAk4PFCleaned.clone(JetCorrections      = cms.InputTag("dqmAk4PFL1FastL2L3Corrector"))
+jetDQMAnalyzerAk4PFCHSCleanedMC=jetDQMAnalyzerAk4PFCHSCleaned.clone(JetCorrections   = cms.InputTag("dqmAk4PFCHSL1FastL2L3Corrector"))
 
-caloMetDQMAnalyzer.JetCorrections    = cms.InputTag("dqmAk4CaloL2L3Corrector");
-pfMetDQMAnalyzer.JetCorrections      = cms.InputTag("dqmAk4PFL1FastL2L3Corrector");
-pfMetT1DQMAnalyzer.JetCorrections    = cms.InputTag("dqmAk4PFCHSL1FastL2L3Corrector");
+caloMetDQMAnalyzerMC=caloMetDQMAnalyzer.clone(JetCorrections    = cms.InputTag("dqmAk4CaloL2L3Corrector"))
+pfMetDQMAnalyzerMC=pfMetDQMAnalyzer.clone(JetCorrections      = cms.InputTag("dqmAk4PFL1FastL2L3Corrector"))
+pfMetT1DQMAnalyzerMC=pfMetT1DQMAnalyzer.clone(JetCorrections    = cms.InputTag("dqmAk4PFCHSL1FastL2L3Corrector"))
 
-jetMETDQMOfflineSource = cms.Sequence(HBHENoiseFilterResultProducer*goodOfflinePrimaryVerticesDQM*AnalyzeSUSYDQM*pileupJetIdProducer*pileupJetIdProducerChs*#QGTagger*
+jetMETDQMOfflineSource = cms.Sequence(HBHENoiseFilterResultProducer*goodOfflinePrimaryVerticesDQM*AnalyzeSUSYDQM*QGTagger*
+                                      pileupJetIdCalculatorCHSDQM*pileupJetIdEvaluatorCHSDQM*
+                                      pileupJetIdCalculatorDQM*pileupJetIdEvaluatorDQM*
                                       jetPreDQMSeq*
                                       dqmAk4CaloL2L3CorrectorChain*dqmAk4PFL1FastL2L3CorrectorChain*dqmAk4PFCHSL1FastL2L3CorrectorChain*
-                                      corrPfMetType1*pfMetT1*
+                                      dqmCorrPfMetType1*pfMETT1*
                                       jetDQMAnalyzerSequence*METDQMAnalyzerSequence)
 
 jetMETDQMOfflineSourceMiniAOD = cms.Sequence(goodOfflinePrimaryVerticesDQMforMiniAOD*jetDQMAnalyzerSequenceMiniAOD*METDQMAnalyzerSequenceMiniAOD)

DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py

@@ -6,13 +6,36 @@
 from DQMOffline.JetMET.jetAnalyzer_cff   import *
 from DQMOffline.JetMET.SUSYDQMAnalyzer_cfi  import *
 from DQMOffline.JetMET.goodOfflinePrimaryVerticesDQM_cfi import *
-from RecoJets.JetProducers.PileupJetID_cfi  import *
+from RecoJets.JetProducers.pileupjetidproducer_cfi  import *
 from RecoJets.JetProducers.QGTagger_cfi  import *
 
-pileupJetIdProducer.jets = cms.InputTag("ak4PFJets")
-pileupJetIdProducer.algos = cms.VPSet(full_5x_chs,cutbased)
+pileupJetIdCalculatorDQM=pileupJetIdCalculator.clone(
+    jets = cms.InputTag("ak4PFJets"),
+    jec = cms.string("AK4PF"),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+)
+
+pileupJetIdEvaluatorDQM=pileupJetIdEvaluator.clone(
+    jets = cms.InputTag("ak4PFJets"),
+    jetids = cms.InputTag("pileupJetIdCalculatorDQM"),
+    algos = cms.VPSet(cms.VPSet(full_53x,cutbased)),
+    jec = cms.string("AK4PF"),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+)
+
+pileupJetIdCalculatorCHSDQM=pileupJetIdCalculator.clone(
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False),
+)
 
-pileupJetIdProducerChs.jets = cms.InputTag("ak4PFJetsCHS")
+pileupJetIdEvaluatorCHSDQM=pileupJetIdEvaluator.clone(
+    jetids = cms.InputTag("pileupJetIdCalculatorCHSDQM"),
+    algos = cms.VPSet(cms.VPSet(full_53x_chs,cutbased)),
+    applyJec = cms.bool(True),
+    inputIsCorrected = cms.bool(False)
+    )
 
 from JetMETCorrections.Configuration.JetCorrectors_cff import ak4CaloL2L3ResidualCorrectorChain,ak4CaloL2L3ResidualCorrector,ak4CaloResidualCorrector,ak4CaloL2L3Corrector,ak4CaloL3AbsoluteCorrector,ak4CaloL2RelativeCorrector
 
@@ -46,11 +69,16 @@
 from JetMETCorrections.Type1MET.correctionTermsPfMetType0PFCandidate_cff import *
 from JetMETCorrections.Type1MET.correctionTermsPfMetType1Type2_cff import corrPfMetType1
 
-corrPfMetType1.jetCorrLabel = cms.InputTag('dqmAk4PFL1FastL2L3ResidualCorrector')
+dqmCorrPfMetType1=corrPfMetType1.clone(jetCorrLabel = cms.InputTag('dqmAk4PFL1FastL2L3ResidualCorrector'))
+pfMETT1=pfMetT1.clone(srcCorrections = cms.VInputTag(
+        cms.InputTag('dqmCorrPfMetType1', 'type1')
+        ))
 
-jetMETDQMOfflineSource = cms.Sequence(HBHENoiseFilterResultProducer*goodOfflinePrimaryVerticesDQM*AnalyzeSUSYDQM*pileupJetIdProducer*pileupJetIdProducerChs*QGTagger*
+jetMETDQMOfflineSource = cms.Sequence(HBHENoiseFilterResultProducer*goodOfflinePrimaryVerticesDQM*AnalyzeSUSYDQM*QGTagger*
+                                      pileupJetIdCalculatorCHSDQM*pileupJetIdEvaluatorCHSDQM*
+                                      pileupJetIdCalculatorDQM*pileupJetIdEvaluatorDQM*
                                       jetPreDQMSeq*
                                       dqmAk4CaloL2L3ResidualCorrectorChain*dqmAk4PFL1FastL2L3ResidualCorrectorChain*dqmAk4PFCHSL1FastL2L3ResidualCorrectorChain*
-                                      corrPfMetType1*pfMetT1*
+                                      dqmCorrPfMetType1*pfMETT1*
                                       jetDQMAnalyzerSequence*METDQMAnalyzerSequence)
 jetMETDQMOfflineSourceMiniAOD = cms.Sequence(goodOfflinePrimaryVerticesDQMforMiniAOD*jetDQMAnalyzerSequenceMiniAOD*METDQMAnalyzerSequenceMiniAOD)

DQMOffline/JetMET/python/metDQMConfig_cfi.py

@@ -139,7 +139,7 @@
 #both CaloMET and type1 MET only cleaned plots are filled
 pfMetT1DQMAnalyzer = caloMetDQMAnalyzer.clone(
     METType=cms.untracked.string('pf'),
-    METCollectionLabel     = cms.InputTag("pfMetT1"),
+    METCollectionLabel     = cms.InputTag("pfMETT1"),
     srcPFlow = cms.InputTag('particleFlow', ''),
     JetCollectionLabel  = cms.InputTag("ak4PFJetsCHS"),
     JetCorrections = cms.InputTag("dqmAk4PFCHSL1FastL2L3ResidualCorrector"),