Merge pull request #18121 from kodolova/JPTJECfastjet91X

Fix for JPTFastjet correction chains

JetMETCorrections/Configuration/python/CorrectedJetProducers_cff.py

@@ -22,7 +22,7 @@
 ak4JPTJetsL1 = cms.EDProducer(
     'CorrectedJPTJetProducer',
     src        = cms.InputTag('JetPlusTrackZSPCorJetAntiKt4'),
-    correctors = cms.VInputTag('ak4JPTL1FastjetCorrector')
+    correctors = cms.VInputTag('ak4L1JPTFastjetCorrector')
     )
 ak4TrackJetsL1 = cms.EDProducer(
     'CorrectedTrackJetProducer',

JetMETCorrections/Configuration/python/JetCorrectionProducers_cff.py

@@ -22,7 +22,7 @@
 ak4JPTJetsL1 = cms.EDProducer(
     'JPTJetCorrectionProducer',
     src        = cms.InputTag('JetPlusTrackZSPCorJetAntiKt4'),
-    correctors = cms.vstring('L1Fastjet')
+    correctors = cms.vstring('ak4L1JPTFastjet')
     )
 ak4TrackJetsL1 = cms.EDProducer(
     'TrackJetCorrectionProducer',

JetMETCorrections/Configuration/python/JetCorrectionServicesAllAlgos_cff.py

@@ -37,14 +37,28 @@
 kt6PFL1Offset   = ak4PFL1Offset.clone(algorithm='KT6PF')
 ic5PFL1Offset   = ak4PFL1Offset.clone(algorithm='IC5PF')
 
-ak7JPTL1Offset  = ak4CaloL1Offset.clone(algorithm='AK7JPT')
+ak7L1JPTOffset = cms.ESProducer(
+    'L1JPTOffsetCorrectionESProducer',
+    level = cms.string('L1JPTOffset'),
+    algorithm = cms.string('AK7JPT'),
+    offsetService = cms.string('ak7CaloL1Offset')
+    )
+
 
 # L1 (fastjet) Correction Services
 ak7CaloL1Fastjet = ak4CaloL1Fastjet.clone(algorithm = 'AK7Calo')
 kt4CaloL1Fastjet = ak4CaloL1Fastjet.clone(algorithm = 'KT4Calo')
 kt6CaloL1Fastjet = ak4CaloL1Fastjet.clone(algorithm = 'KT6Calo')
 ic5CaloL1Fastjet = ak4CaloL1Fastjet.clone(algorithm = 'IC5Calo')
 
+ak7L1JPTFastjet = cms.ESProducer(
+    'L1JPTOffsetCorrectionESProducer',
+    level = cms.string('L1JPTOffset'),
+    algorithm = cms.string('AK7JPT'),
+    offsetService = cms.string('ak7CaloL1Fastjet')
+    )
+
+
 ak1PFL1Fastjet   = ak4PFL1Fastjet.clone(algorithm='AK1PF')
 ak1PFCHSL1Fastjet   = ak4PFCHSL1Fastjet.clone(algorithm='AK1PFchs')
 ak2PFL1Fastjet   = ak4PFL1Fastjet.clone(algorithm='AK2PF')
@@ -67,11 +81,6 @@
 kt6PFL1Fastjet   = ak4PFL1Fastjet.clone(algorithm='KT6PF')
 ic5PFL1Fastjet   = ak4PFL1Fastjet.clone(algorithm='IC5PF')
 
-ak7JPTL1Fastjet  = ak4CaloL1Fastjet.clone(algorithm='AK7JPT')
-
-# SPECIAL L1JPTOffset
-ak7L1JPTOffset = ak4L1JPTOffset.clone(algorithm='AK7JPT')
-
 # L2 (relative eta-conformity) Correction Services
 ak7CaloL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK7Calo' )
 kt4CaloL2Relative = ak4CaloL2Relative.clone( algorithm = 'KT4Calo' )
@@ -365,7 +374,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1L2L3 = cms.ESProducer(
     'JetCorrectionESChain',
-    correctors = cms.vstring('ak7JPTL1Offset','ak7L1JPTOffset','ak7JPTL2Relative','ak7JPTL3Absolute')
+    correctors = cms.vstring('ak7L1JPTOffset','ak7JPTL2Relative','ak7JPTL3Absolute')
     )
 
 # L2L3Residual CORRECTION SERVICES
@@ -583,7 +592,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1L2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
-    correctors = cms.vstring('ak7JPTL1Offset','ak7L1JPTOffset','ak7JPTL2Relative','ak7JPTL3Absolute','ak7JPTResidual')
+    correctors = cms.vstring('ak7L1JPTOffset','ak7JPTL2Relative','ak7JPTL3Absolute','ak7JPTResidual')
     )
 
 # L1FastL2L3 CORRECTION SERVICES
@@ -610,6 +619,11 @@
 ak4TrackL1FastL2L3 = ak4TrackL2L3.clone()
 ak4TrackL1FastL2L3.correctors.insert(0,'ak4CaloL1Fastjet')
 
+ak7JPTL1FastL2L3 = cms.ESProducer(
+    'JetCorrectionESChain',
+    correctors = cms.vstring('ak7L1JPTFastjet','ak7JPTL2Relative','ak7JPTL3Absolute')
+    )
+
 # L1FastL2L3Residual CORRECTION SERVICES
 ak7CaloL1FastL2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
@@ -719,7 +733,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1FastL2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
-    correctors = cms.vstring('ak7JPTL1Fastjet','ak7L1JPTOffset','ak7JPTL2Relative','ak7JPTL3Absolute','ak7JPTResidual')
+    correctors = cms.vstring('ak7L1JPTFastjet','ak7JPTL2Relative','ak7JPTL3Absolute','ak7JPTResidual')
     )
 
 # L2L3L6 CORRECTION SERVICES

JetMETCorrections/Configuration/python/JetCorrectionServices_cff.py

@@ -29,13 +29,13 @@
 
 ak4PFL1Offset = ak4CaloL1Offset.clone(algorithm = 'AK4PF')
 ak4PFCHSL1Offset = ak4CaloL1Offset.clone(algorithm = 'AK4PFchs')
-ak4JPTL1Offset = ak4CaloL1Offset.clone(algorithm = 'AK5JPT')
+ak4JPTL1Offset = ak4CaloL1Offset.clone(algorithm = 'AK4JPT')
 
 # L1 (JPT Offset) Correction Service
 ak4L1JPTOffset = cms.ESProducer(
     'L1JPTOffsetCorrectionESProducer',
     level = cms.string('L1JPTOffset'),
-    algorithm = cms.string('AK5JPT'),
+    algorithm = cms.string('AK4JPT'),
     offsetService = cms.string('ak4CaloL1Offset')
     )
 
@@ -58,7 +58,14 @@
     algorithm   = cms.string('AK4PFchs'),
     srcRho      = cms.InputTag( 'fixedGridRhoFastjetAll' )
     )
-ak4JPTL1Fastjet = ak4CaloL1Fastjet.clone()
+
+ak4L1JPTFastjet = cms.ESProducer(
+    'L1JPTOffsetCorrectionESProducer',
+    level = cms.string('L1JPTOffset'),
+    algorithm = cms.string('AK4JPT'),
+    offsetService = cms.string('ak4CaloL1Fastjet')
+    )
+
 
 # L2 (relative eta-conformity) Correction Services
 ak4CaloL2Relative = cms.ESProducer(
@@ -68,7 +75,7 @@
     )
 ak4PFL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK4PF' )
 ak4PFCHSL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK4PFchs' )
-ak4JPTL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK5JPT' )
+ak4JPTL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK4JPT' )
 ak4TrackL2Relative = ak4CaloL2Relative.clone( algorithm = 'AK5TRK' )
 
 # L3 (absolute) Correction Services
@@ -79,7 +86,7 @@
     )
 ak4PFL3Absolute     = ak4CaloL3Absolute.clone( algorithm = 'AK4PF' )
 ak4PFCHSL3Absolute     = ak4CaloL3Absolute.clone( algorithm = 'AK4PFchs' )
-ak4JPTL3Absolute    = ak4CaloL3Absolute.clone( algorithm = 'AK5JPT' )
+ak4JPTL3Absolute    = ak4CaloL3Absolute.clone( algorithm = 'AK4JPT' )
 ak4TrackL3Absolute  = ak4CaloL3Absolute.clone( algorithm = 'AK5TRK' )
 
 # Residual Correction Services
@@ -90,7 +97,7 @@
     )
 ak4PFResidual  = ak4CaloResidual.clone( algorithm = 'AK4PF' )
 ak4PFCHSResidual  = ak4CaloResidual.clone( algorithm = 'AK4PFchs' )
-ak4JPTResidual = ak4CaloResidual.clone( algorithm = 'AK5JPT' )
+ak4JPTResidual = ak4CaloResidual.clone( algorithm = 'AK4JPT' )
 
 # L6 (semileptonically decaying b-jet) Correction Services
 ak4CaloL6SLB = cms.ESProducer(
@@ -210,7 +217,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak4JPTL1FastL2L3 = cms.ESProducer(
     'JetCorrectionESChain',
-    correctors = cms.vstring('ak4JPTL1Fastjet','ak4JPTL2Relative','ak4JPTL3Absolute')
+    correctors = cms.vstring('ak4L1JPTFastjet','ak4JPTL2Relative','ak4JPTL3Absolute')
     )
 
 # L1L2L3Residual CORRECTION SERVICES WITH FASTJET
@@ -230,7 +237,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak4JPTL1FastL2L3Residual = cms.ESProducer(
     'JetCorrectionESChain',
-    correctors = cms.vstring('ak4JPTL1Fastjet','ak4JPTL2Relative','ak4JPTL3Absolute','ak4JPTResidual')
+    correctors = cms.vstring('ak4L1JPTFastjet','ak4JPTL2Relative','ak4JPTL3Absolute','ak4JPTResidual')
     )
 
 # L2L3L6 CORRECTION SERVICES

JetMETCorrections/Configuration/python/JetCorrectorsAllAlgos_cff.py

@@ -37,8 +37,6 @@
 kt6PFL1OffsetCorrector   = ak4PFL1OffsetCorrector.clone()
 ic5PFL1OffsetCorrector   = ak4PFL1OffsetCorrector.clone()
 
-ak7JPTL1OffsetCorrector  = ak4CaloL1OffsetCorrector.clone()
-
 # L1 (fastjet) Correctors
 ak7CaloL1FastjetCorrector = ak4CaloL1FastjetCorrector.clone()
 kt4CaloL1FastjetCorrector = ak4CaloL1FastjetCorrector.clone()
@@ -67,15 +65,20 @@
 kt6PFL1FastjetCorrector   = ak4PFL1FastjetCorrector.clone()
 ic5PFL1FastjetCorrector   = ak4PFL1FastjetCorrector.clone()
 
-ak7JPTL1FastjetCorrector  = ak4JPTL1FastjetCorrector.clone()
-
 # SPECIAL L1JPTOffset
-ak7L1JPTOffsetCorrector = ak4L1JPTOffsetCorrector.clone( offsetService = 'ak7CaloL1OffsetCorrector' )
+ak7L1JPTOffsetCorrector = ak4L1JPTOffsetCorrector.clone( offsetService = 'ak7CaloL1OffsetCorrector', algorithm = 'AK7JPT' )
 ak7L1JPTOffsetCorrectorTask = cms.Task(
     ak7CaloL1OffsetCorrector, ak7L1JPTOffsetCorrector
 )
 ak7L1JPTOffsetCorrectorChain = cms.Sequence(ak7L1JPTOffsetCorrectorTask)
 
+ak7L1JPTFastjetCorrector = ak4L1JPTFastjetCorrector.clone( offsetService = 'ak7CaloL1FastjetCorrector', algorithm = 'AK7JPT' )
+ak7L1JPTFastjetCorrectorTask = cms.Task(
+    ak7CaloL1FastjetCorrector, ak7L1JPTFastjetCorrector
+)
+ak7L1JPTFastjetCorrectorChain = cms.Sequence(ak7L1JPTFastjetCorrectorTask)
+
+
 # L2 (relative eta-conformity) Correctors
 ak7CaloL2RelativeCorrector = ak4CaloL2RelativeCorrector.clone( algorithm = 'AK7Calo' )
 ak7JPTL2RelativeCorrector = ak4CaloL2RelativeCorrector.clone( algorithm = 'AK7JPT' )
@@ -434,7 +437,7 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL2L3Corrector = cms.EDProducer(
     'ChainedJetCorrectorProducer',
-    correctors = cms.VInputTag('ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector')
+    correctors = cms.VInputTag('ak7CaloL1OffsetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector')
     )
 ak7JPTL2L3CorrectorTask = cms.Task(
     ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTL2L3Corrector
@@ -511,10 +514,10 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1L2L3Corrector = cms.EDProducer(
     'ChainedJetCorrectorProducer',
-    correctors = cms.VInputTag('ak7JPTL1OffsetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector')
+    correctors = cms.VInputTag('ak7CaloL1OffsetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector')
     )
 ak7JPTL1L2L3CorrectorTask = cms.Task(
-    ak7JPTL1OffsetCorrector, ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTL1L2L3Corrector
+    ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTL1L2L3Corrector
 )
 ak7JPTL1L2L3CorrectorChain = cms.Sequence(ak7JPTL1L2L3CorrectorTask)
 
@@ -933,10 +936,10 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1L2L3ResidualCorrector = cms.EDProducer(
     'ChainedJetCorrectorProducer',
-    correctors = cms.VInputTag('ak7JPTL1OffsetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector','ak7JPTResidualCorrector')
+    correctors = cms.VInputTag('ak7CaloL1OffsetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector','ak7JPTResidualCorrector')
     )
 ak7JPTL1L2L3ResidualCorrectorTask = cms.Task(
-    ak7JPTL1OffsetCorrector, ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTResidualCorrector, ak7JPTL1L2L3ResidualCorrector
+    ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTResidualCorrector, ak7JPTL1L2L3ResidualCorrector
 )
 ak7JPTL1L2L3ResidualCorrectorChain = cms.Sequence(ak7JPTL1L2L3ResidualCorrectorTask)
 
@@ -1004,6 +1007,15 @@
 )
 ak4TrackL1FastL2L3CorrectorChain = cms.Sequence(ak4TrackL1FastL2L3CorrectorTask)
 
+ak7JPTL1FastL2L3Corrector = cms.EDProducer(
+    'ChainedJetCorrectorProducer',
+    correctors = cms.VInputTag('ak7CaloL1FastjetCorrector','ak7L1JPTFastjetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector')
+    )
+ak7JPTL1FastL2L3CorrectorTask = cms.Task(
+    ak7L1JPTFastjetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTL1FastL2L3Corrector
+)
+ak7JPTL1FastL2L3CorrectorChain = cms.Sequence(ak7JPTL1FastL2L3CorrectorTask)
+
 # L1FastL2L3Residual CORRECTORS
 ak7CaloL1FastL2L3ResidualCorrector = cms.EDProducer(
     'ChainedJetCorrectorProducer',
@@ -1213,10 +1225,10 @@
 #--- L1JPTOffset is NOT the same as L1Offset !!!!!
 ak7JPTL1FastL2L3ResidualCorrector = cms.EDProducer(
     'ChainedJetCorrectorProducer',
-    correctors = cms.VInputTag('ak7JPTL1FastjetCorrector','ak7L1JPTOffsetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector','ak7JPTResidualCorrector')
+    correctors = cms.VInputTag('ak7CaloL1FastjetCorrector','ak7L1JPTFastjetCorrector','ak7JPTL2RelativeCorrector','ak7JPTL3AbsoluteCorrector','ak7JPTResidualCorrector')
     )
 ak7JPTL1FastL2L3ResidualCorrectorTask = cms.Task(
-    ak7JPTL1FastjetCorrector, ak7L1JPTOffsetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTResidualCorrector,  ak7JPTL1FastL2L3ResidualCorrector
+    ak7L1JPTFastjetCorrectorTask, ak7JPTL2RelativeCorrector, ak7JPTL3AbsoluteCorrector, ak7JPTResidualCorrector,  ak7JPTL1FastL2L3ResidualCorrector
 )
 ak7JPTL1FastL2L3ResidualCorrectorChain = cms.Sequence(ak7JPTL1FastL2L3ResidualCorrectorTask)
 
@@ -1412,6 +1424,7 @@
     kt6PFL1L2L3ResidualCorrectorTask,
     ic5PFL1L2L3ResidualCorrectorTask,
     ak7JPTL1L2L3ResidualCorrectorTask,
+    ak7L1JPTFastjetCorrectorTask,
     ak7CaloL1FastL2L3CorrectorTask,
     kt4CaloL1FastL2L3CorrectorTask,
     kt6CaloL1FastL2L3CorrectorTask,