Merge pull request cms-sw#1958 from rappoccio/rappoccio_700pre11_AddCHSJec

Bug fix : adding JEC producers for AK5CHS and AK7CHS

Author: ktf

JetMETCorrections/Configuration/python/JetCorrectionProducersAllAlgos_cff.py

@@ -10,6 +10,7 @@
 ic5CaloJetsL1 = ak5CaloJetsL1.clone( src = 'ic5CaloJets' )
 
 ak7PFJetsL1 = ak5PFJetsL1.clone( src = 'ak7PFJets' )
+ak7PFCHSJetsL1 = ak5PFCHSJetsL1.clone( src = 'ak7PFCHSJets' )
 kt4PFJetsL1 = ak5PFJetsL1.clone( src = 'kt4PFJets' )
 kt6PFJetsL1 = ak5PFJetsL1.clone( src = 'kt6PFJets' )
 ic5PFJetsL1 = ak5PFJetsL1.clone( src = 'ic5PFJets' )
@@ -22,6 +23,7 @@
 ic5CaloJetsL2 = ic5CaloJetsL1.clone(correctors = ['ic5CaloL2Relative'])
 
 ak7PFJetsL2 = ak7PFJetsL1.clone(correctors = ['ak7PFL2Relative'])
+ak7PFCHSJetsL2 = ak7PFCHSJetsL1.clone(correctors = ['ak7PFCHSL2Relative'])
 kt4PFJetsL2 = kt4PFJetsL1.clone(correctors = ['kt4PFL2Relative'])
 kt6PFJetsL2 = kt6PFJetsL1.clone(correctors = ['kt6PFL2Relative'])
 ic5PFJetsL2 = ic5PFJetsL1.clone(correctors = ['ic5PFL2Relative'])
@@ -36,6 +38,7 @@
 ic5CaloJetsL2L3 = ic5CaloJetsL1.clone(correctors = ['ic5CaloL2L3'])
 
 ak7PFJetsL2L3 = ak7PFJetsL1.clone(correctors = ['ak7PFL2L3'])
+ak7PFCHSJetsL2L3 = ak7PFCHSJetsL1.clone(correctors = ['ak7PFCHSL2L3'])
 kt4PFJetsL2L3 = kt4PFJetsL1.clone(correctors = ['kt4PFL2L3'])
 kt6PFJetsL2L3 = kt6PFJetsL1.clone(correctors = ['kt6PFL2L3'])
 ic5PFJetsL2L3 = ic5PFJetsL1.clone(correctors = ['ic5PFL2L3'])
@@ -50,6 +53,7 @@
 ic5CaloJetsL1L2L3 = ic5CaloJetsL1.clone(correctors = ['ic5CaloL1L2L3'])
 
 ak7PFJetsL1L2L3 = ak7PFJetsL1.clone(correctors = ['ak7PFL1L2L3'])
+ak7PFCHSJetsL1L2L3 = ak7PFCHSJetsL1.clone(correctors = ['ak7PFCHSL1L2L3'])
 kt4PFJetsL1L2L3 = kt4PFJetsL1.clone(correctors = ['kt4PFL1L2L3'])
 kt6PFJetsL1L2L3 = kt6PFJetsL1.clone(correctors = ['kt6PFL1L2L3'])
 ic5PFJetsL1L2L3 = ic5PFJetsL1.clone(correctors = ['ic5PFL1L2L3'])

JetMETCorrections/Configuration/python/JetCorrectionProducers_cff.py

@@ -13,6 +13,12 @@
     src        = cms.InputTag('ak5PFJets'),
     correctors = cms.vstring('L1Fastjet')
     )
+ak5PFCHSJetsL1 = cms.EDProducer(
+    'PFJetCorrectionProducer',
+    src        = cms.InputTag('ak5PFJetsCHS'),
+    correctors = cms.vstring('L1Fastjet')
+    )
+
 ak5JPTJetsL1 = cms.EDProducer(
     'JPTJetCorrectionProducer',
     src        = cms.InputTag('JetPlusTrackZSPCorJetAntiKt5'),
@@ -29,19 +35,22 @@
 # L2L3 Correction Producers
 ak5CaloJetsL2 = ak5CaloJetsL1.clone(correctors = ['ak5CaloL2Relative'])
 ak5PFJetsL2 = ak5PFJetsL1.clone(correctors = ['ak5PFL2Relative'])
+ak5PFCHSJetsL2 = ak5PFCHSJetsL1.clone(correctors = ['ak5PFCHSL2Relative'])
 ak5JPTJetsL2 = ak5JPTJetsL1.clone(correctors = ['ak5JPTL2Relative'])
 ak5TrackJetsL2 = ak5TrackJetsL1.clone(correctors = ['ak5TRKL2Relative'])
 
 # L2L3 Correction Producers
 ak5CaloJetsL2L3 = ak5CaloJetsL1.clone(correctors = ['ak5CaloL2L3'])
 ak5PFJetsL2L3 = ak5PFJetsL1.clone(correctors = ['ak5PFL2L3'])
+ak5PFCHSJetsL2L3 = ak5PFCHSJetsL1.clone(correctors = ['ak5PFCHSL2L3'])
 ak5JPTJetsL2L3 = ak5JPTJetsL1.clone(correctors = ['ak5JPTL2L3'])
 ak5TrackJetsL2L3 = ak5TrackJetsL1.clone(correctors = ['ak5TRKL2L3'])
 
 
 # L1L2L3 Correction Producers
 ak5CaloJetsL1L2L3 = ak5CaloJetsL1.clone(correctors = ['ak5CaloL1L2L3'])
 ak5PFJetsL1L2L3 = ak5PFJetsL1.clone(correctors = ['ak5PFL1L2L3'])
+ak5PFCHSJetsL1L2L3 = ak5PFCHSJetsL1.clone(correctors = ['ak5PFCHSL1L2L3'])
 ak5JPTJetsL1L2L3 = ak5JPTJetsL1.clone(correctors = ['ak5JPTL1L2L3'])
 ak5TrackJetsL1L2L3 = ak5TrackJetsL1.clone(correctors = ['ak5TRKL1L2L3'])
 
@@ -53,3 +62,4 @@
 # L1L2L3L6 CORRECTION PRODUCERS
 ak5CaloJetsL1L2L3L6 = ak5CaloJetsL1.clone(correctors = ['ak5CaloL1L2L3L6'])
 ak5PFJetsL1L2L3L6 = ak5PFJetsL1.clone(correctors = ['ak5PFL1L2L3L6'])
+

JetMETCorrections/Configuration/python/JetCorrectionServicesAllAlgos_cff.py

@@ -14,6 +14,7 @@
 ic5CaloL1Offset = ak5CaloL1Offset.clone()
 
 ak7PFL1Offset   = ak5PFL1Offset.clone()
+ak7PFCHSL1Offset   = ak5PFCHSL1Offset.clone()
 kt4PFL1Offset   = ak5PFL1Offset.clone()
 kt6PFL1Offset   = ak5PFL1Offset.clone()
 ic5PFL1Offset   = ak5PFL1Offset.clone()
@@ -27,6 +28,7 @@
 ic5CaloL1Fastjet = ak5CaloL1Fastjet.clone()
 
 ak7PFL1Fastjet   = ak5PFL1Fastjet.clone()
+ak7PFCHSL1Fastjet   = ak5PFCHSL1Fastjet.clone()
 kt4PFL1Fastjet   = ak5PFL1Fastjet.clone()
 kt6PFL1Fastjet   = ak5PFL1Fastjet.clone()
 ic5PFL1Fastjet   = ak5PFL1Fastjet.clone()
@@ -43,6 +45,7 @@
 ic5CaloL2Relative = ak5CaloL2Relative.clone( algorithm = 'IC5Calo' )
 
 ak7PFL2Relative   = ak5PFL2Relative.clone  ( algorithm = 'AK7PF' )
+ak7PFCHSL2Relative   = ak5PFCHSL2Relative.clone  ( algorithm = 'AK7PFCHS' )
 kt4PFL2Relative   = ak5PFL2Relative.clone  ( algorithm = 'KT4PF' )
 kt6PFL2Relative   = ak5PFL2Relative.clone  ( algorithm = 'KT6PF' )
 ic5PFL2Relative   = ak5PFL2Relative.clone  ( algorithm = 'IC5PF' )
@@ -54,6 +57,7 @@
 ic5CaloL3Absolute = ak5CaloL3Absolute.clone( algorithm = 'IC5Calo' )
 
 ak7PFL3Absolute   = ak5PFL3Absolute.clone  ( algorithm = 'AK7PF' )
+ak7PFCHSL3Absolute   = ak5PFCHSL3Absolute.clone  ( algorithm = 'AK7PFCHS' )
 kt4PFL3Absolute   = ak5PFL3Absolute.clone  ( algorithm = 'KT4PF' )
 kt6PFL3Absolute   = ak5PFL3Absolute.clone  ( algorithm = 'KT6PF' )
 ic5PFL3Absolute   = ak5PFL3Absolute.clone  ( algorithm = 'IC5PF' )
@@ -65,6 +69,7 @@
 ic5CaloResidual   = ak5CaloResidual.clone()
 
 ak7PFResidual     = ak5PFResidual.clone()
+ak7PFCHSResidual     = ak5PFCHSResidual.clone()
 kt4PFResidual     = ak5PFResidual.clone()
 kt6PFResidual     = ak5PFResidual.clone()
 ic5PFResidual     = ak5PFResidual.clone()
@@ -131,6 +136,11 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak7PFL2Relative','ak7PFL3Absolute')
     )
+
+ak7PFCHSL2L3 = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak7PFCHSL2Relative','ak7PFCHSL3Absolute')
+    )
 kt4PFL2L3 = cms.ESProducer(
     'JetCorrectionESChain',
     correctors = cms.vstring('kt4PFL2Relative','kt4PFL3Absolute')
@@ -214,6 +224,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak7PFL2Relative','ak7PFL3Absolute','ak7PFResidual')
     )
+ak7PFCHSL2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak7PFCHSL2Relative','ak7PFCHSL3Absolute','ak7PFCHSResidual')
+    )
 kt4PFL2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
     correctors = cms.vstring('kt4PFL2Relative','kt4PFL3Absolute','kt4PFResidual')
@@ -249,6 +263,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak7PFL1Offset','ak7PFL2Relative','ak7PFL3Absolute','ak7PFResidual')
     )
+ak7PFCHSL1L2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak7PFCHSL1Offset','ak7PFCHSL2Relative','ak7PFCHSL3Absolute','ak7PFCHSResidual')
+    )
 kt4PFL1L2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
     correctors = cms.vstring('kt4PFL1Offset','kt4PFL2Relative','kt4PFL3Absolute','kt4PFResidual')
@@ -280,6 +298,8 @@
 
 ak7PFL1FastL2L3 = ak7PFL2L3.clone()
 ak7PFL1FastL2L3.correctors.insert(0,'ak5PFL1Fastjet')
+ak7PFCHSL1FastL2L3 = ak7PFCHSL2L3.clone()
+ak7PFCHSL1FastL2L3.correctors.insert(0,'ak5PFCHSL1Fastjet')
 kt4PFL1FastL2L3 = kt4PFL2L3.clone()
 kt4PFL1FastL2L3.correctors.insert(0,'ak5PFL1Fastjet')
 kt6PFL1FastL2L3 = kt6PFL2L3.clone()
@@ -312,6 +332,11 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak7PFL1Fastjet','ak7PFL2Relative','ak7PFL3Absolute','ak7PFResidual')
     )
+ak7PFCHSL1FastL2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak7PFCHSL1Fastjet','ak7PFCHSL2Relative','ak7PFCHSL3Absolute','ak7PFCHSResidual')
+    )
+
 kt4PFL1FastL2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
     correctors = cms.vstring('kt4PFL1Fastjet','kt4PFL2Relative','kt4PFL3Absolute','kt4PFResidual')

JetMETCorrections/Configuration/python/JetCorrectionServices_cff.py

@@ -27,7 +27,8 @@
     minVtxNdof = cms.int32(4)
     )
 
-ak5PFL1Offset = ak5CaloL1Offset.clone(algorithm = 'AK5PF') 
+ak5PFL1Offset = ak5CaloL1Offset.clone(algorithm = 'AK5PF')
+ak5PFCHSL1Offset = ak5CaloL1Offset.clone(algorithm = 'AK5PFCHS') 
 ak5JPTL1Offset = ak5CaloL1Offset.clone(algorithm = 'AK5JPT')
 
 # L1 (JPT Offset) Correction Service
@@ -51,6 +52,12 @@
     algorithm   = cms.string('AK5PF'),
     srcRho      = cms.InputTag( 'fixedGridRhoFastjetAll' )
     )
+ak5PFCHSL1Fastjet = cms.ESProducer(
+    'L1FastjetCorrectionESProducer',
+    level       = cms.string('L1FastJet'),
+    algorithm   = cms.string('AK5PFCHS'),
+    srcRho      = cms.InputTag( 'fixedGridRhoFastjetAll' )
+    )
 ak5JPTL1Fastjet = ak5CaloL1Fastjet.clone()
 
 # L2 (relative eta-conformity) Correction Services
@@ -60,6 +67,7 @@
     algorithm = cms.string('AK5Calo')
     )
 ak5PFL2Relative = ak5CaloL2Relative.clone( algorithm = 'AK5PF' )
+ak5PFCHSL2Relative = ak5CaloL2Relative.clone( algorithm = 'AK5PFCHS' )
 ak5JPTL2Relative = ak5CaloL2Relative.clone( algorithm = 'AK5JPT' )
 ak5TrackL2Relative = ak5CaloL2Relative.clone( algorithm = 'AK5TRK' )
 
@@ -70,6 +78,7 @@
     algorithm = cms.string('AK5Calo')
     )
 ak5PFL3Absolute     = ak5CaloL3Absolute.clone( algorithm = 'AK5PF' )
+ak5PFCHSL3Absolute     = ak5CaloL3Absolute.clone( algorithm = 'AK5PFCHS' )
 ak5JPTL3Absolute    = ak5CaloL3Absolute.clone( algorithm = 'AK5JPT' )
 ak5TrackL3Absolute  = ak5CaloL3Absolute.clone( algorithm = 'AK5TRK' )
 
@@ -80,6 +89,7 @@
     algorithm = cms.string('AK5Calo')
     )
 ak5PFResidual  = ak5CaloResidual.clone( algorithm = 'AK5PF' )
+ak5PFCHSResidual  = ak5CaloResidual.clone( algorithm = 'AK5PFCHS' )
 ak5JPTResidual = ak5CaloResidual.clone( algorithm = 'AK5JPT' )
 
 # L6 (semileptonically decaying b-jet) Correction Services
@@ -114,6 +124,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak5PFL2Relative','ak5PFL3Absolute')
     )
+ak5PFCHSL2L3 = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak5PFCHSL2Relative','ak5PFCHSL3Absolute')
+    )
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL2L3 = cms.ESProducer(
@@ -134,6 +148,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak5PFL2Relative','ak5PFL3Absolute','ak5PFResidual')
     )
+ak5PFCHSL2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak5PFCHSL2Relative','ak5PFCHSL3Absolute','ak5PFCHSResidual')
+    )
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL2L3Residual = cms.ESProducer(
@@ -150,6 +168,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak5PFL1Offset','ak5PFL2Relative','ak5PFL3Absolute')
     )
+ak5PFCHSL1L2L3 = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak5PFCHSL1Offset','ak5PFCHSL2Relative','ak5PFCHSL3Absolute')
+    )
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL1L2L3 = cms.ESProducer(
@@ -166,6 +188,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak5PFL1Offset','ak5PFL2Relative','ak5PFL3Absolute','ak5PFResidual')
     )
+ak5PFCHSL1L2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak5PFCHSL1Offset','ak5PFCHSL2Relative','ak5PFCHSL3Absolute','ak5PFCHSResidual')
+    )
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL1L2L3Residual = cms.ESProducer(
@@ -178,6 +204,8 @@
 ak5CaloL1FastL2L3.correctors.insert(0,'ak5CaloL1Fastjet')
 ak5PFL1FastL2L3 = ak5PFL2L3.clone()
 ak5PFL1FastL2L3.correctors.insert(0,'ak5PFL1Fastjet')
+ak5PFCHSL1FastL2L3 = ak5PFCHSL2L3.clone()
+ak5PFCHSL1FastL2L3.correctors.insert(0,'ak5PFCHSL1Fastjet')
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL1FastL2L3 = cms.ESProducer(
@@ -194,6 +222,10 @@
     'JetCorrectionESChain',
     correctors = cms.vstring('ak5PFL1Fastjet','ak5PFL2Relative','ak5PFL3Absolute','ak5PFResidual')
     )
+ak5PFCHSL1FastL2L3Residual = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak5PFCHSL1Fastjet','ak5PFCHSL2Relative','ak5PFCHSL3Absolute','ak5PFCHSResidual')
+    )
 #--- JPT needs the L1JPTOffset to account for the ZSP changes.
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak5JPTL1FastL2L3Residual = cms.ESProducer(