Merge pull request #6629 from JetMETdqmval/develop_DQM_73x_V1

enable MiniAOD validation for Jet and MET, switch to new JetCorrector
cms-sw · Dec 10, 2014 · e9f287a · e9f287a
2 parents ece0e9a + 67fe443
commit e9f287a
Show file tree

Hide file tree

Showing 16 changed files with 573 additions and 586 deletions.
diff --git a/Configuration/StandardSequences/python/Validation_cff.py b/Configuration/StandardSequences/python/Validation_cff.py
@@ -17,6 +17,7 @@
 
 
 from Validation.RecoMET.METRelValForDQM_cff import *
+from Validation.RecoJets.JetValidation_cff import *
 from Validation.TrackingMCTruth.trackingTruthValidation_cfi import *
 from Validation.RecoTrack.TrackValidation_cff import *
 from Validation.RecoMuon.muonValidation_cff import *
@@ -27,7 +28,7 @@
 # miniAOD
 from Validation.RecoParticleFlow.miniAODValidation_cff import *
 
-prevalidation = cms.Sequence( globalPrevalidation * hltassociation * metPreValidSeq )
+prevalidation = cms.Sequence( globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq )
 prevalidationLiteTracking = cms.Sequence( prevalidation )
 prevalidationLiteTracking.replace(globalPrevalidation,globalPrevalidationLiteTracking)
 prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence )

diff --git a/FastSimulation/Configuration/python/Validation_cff.py b/FastSimulation/Configuration/python/Validation_cff.py
@@ -4,8 +4,9 @@
 from HLTriggerOffline.Common.HLTValidation_cff import *
 from DQM.Physics.DQMPhysics_cff import *
 from Validation.RecoMET.METRelValForDQM_cff import metPreValidSeq
+from Validation.RecoJets.JetValidation_cff import jetPreValidSeq 
 
-prevalidation = cms.Sequence(globalAssociation+hltassociation_fastsim+metPreValidSeq)
+prevalidation = cms.Sequence(globalAssociation+hltassociation_fastsim+metPreValidSeq+jetPreValidSeq)
 prevalidation_preprod = cms.Sequence(globalAssociation)
 prevalidation_prod = cms.Sequence(globalAssociation)
 validation = cms.Sequence(basicGenTest_seq+globalValidation+hltvalidation_fastsim+dqmPhysics) 

diff --git a/Validation/RecoHI/python/JetValidationHeavyIons_cff.py b/Validation/RecoHI/python/JetValidationHeavyIons_cff.py
@@ -15,72 +15,65 @@
 
 JetAnalyzerICPU5Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("iterativeConePu5CaloJets"),
     srcGen = cms.InputTag("iterativeCone5HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    primVertex     = cms.InputTag("hiSelectedVertex"),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )
 
 JetAnalyzerICPU7Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("iterativeConePu7CaloJets"),
     srcGen = cms.InputTag("iterativeCone7HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )
 
 JetAnalyzerAkPU5Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("akPu5CaloJets"),
     srcGen = cms.InputTag("ak4HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    primVertex     = cms.InputTag("hiSelectedVertex"),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )
 
 JetAnalyzerAkPU7Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("akPu7CaloJets"),
     srcGen = cms.InputTag("ak7HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    primVertex     = cms.InputTag("hiSelectedVertex"),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )
 
 JetAnalyzerAkFastPU5Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("akFastPu5CaloJets"),
     srcGen = cms.InputTag("ak4HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    primVertex     = cms.InputTag("hiSelectedVertex"),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )
 
 JetAnalyzerAkFastPU7Calo = cms.EDAnalyzer("JetTester",
     JetType = cms.untracked.string('calo'),
-    OutputFile = cms.untracked.string(''),
     src = cms.InputTag("akFastPu7CaloJets"),
     srcGen = cms.InputTag("ak7HiCleanedGenJets"),
-    JetCorrections = cms.string(""),
+    primVertex     = cms.InputTag("hiSelectedVertex"),
+    JetCorrections = cms.InputTag(""),
     recoJetPtThreshold = cms.double(40),
-    genEnergyFractionThreshold     = cms.double(0.05),
     matchGenPtThreshold                 = cms.double(20.0),
     RThreshold                     = cms.double(0.3)
 )

diff --git a/Validation/RecoJets/plugins/BuildFile.xml b/Validation/RecoJets/plugins/BuildFile.xml
@@ -9,6 +9,7 @@
 <use   name="RecoJets/JetProducers"/>
 <use   name="Validation/RecoJets"/>
 <use   name="DataFormats/JetReco"/>
+<use   name="DataFormats/PatCandidates"/>
 <use   name="root"/>
 <library   file="*.cc" name="ValidationRecoJetsPlugins">
   <flags   EDM_PLUGIN="1"/>