Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Sequence to Task RecoJets RecoMET #27887

Merged
merged 1 commit into from
Aug 30, 2019
Merged

Move Sequence to Task RecoJets RecoMET #27887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions JetMETCorrections/Configuration/python/JetCorrectorsForReco_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
from JetMETCorrections.Configuration.JetCorrectors_cff import ak4PFCHSL1FastL2L3CorrectorChain,ak4PFCHSL1FastL2L3CorrectorTask
from JetMETCorrections.Configuration.JetCorrectors_cff import ak4PFCHSL1FastL2L3Corrector,ak4PFCHSL3AbsoluteCorrector,ak4PFCHSL2RelativeCorrector,ak4PFCHSL1FastjetCorrector

jetCorrectorsForReco = cms.Sequence(
ak4PFL1FastL2L3CorrectorChain * ak4PFCHSL1FastL2L3CorrectorChain
)
jetCorrectorsForRecoTask = cms.Task( ak4PFL1FastL2L3CorrectorTask, ak4PFCHSL1FastL2L3CorrectorTask)
jetCorrectorsForReco = cms.Sequence(jetCorrectorsForRecoTask)
7 changes: 3 additions & 4 deletions RecoJets/Configuration/python/JetIDProducers_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from RecoJets.JetProducers.ak4JetID_cfi import *

recoAllJetIds = cms.Sequence( ak4JetID )

recoJetIds = cms.Sequence( ak4JetID
)
recoJetIdsTask = cms.Task( ak4JetID )
recoJetIds = cms.Sequence(recoJetIdsTask)
recoAllJetIds = cms.Sequence(recoJetIdsTask)
4 changes: 2 additions & 2 deletions RecoJets/Configuration/python/RecoCaloTowersGR_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
towerMaker.HBThreshold1 = cms.double(0.6)
towerMaker.HBThreshold2 = cms.double(0.6)

recoCaloTowersGR = cms.Sequence(towerMaker+towerMakerWithHO)

recoCaloTowersGRTask = cms.Task(towerMaker,towerMakerWithHO)
recoCaloTowersGR = cms.Sequence(recoCaloTowersGRTask)
9 changes: 6 additions & 3 deletions RecoJets/Configuration/python/RecoGenJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
)
recoGenJets = cms.Sequence(recoGenJetsTask)

recoAllGenJets=cms.Sequence(ak4GenJets+
recoAllGenJetsTask=cms.Task(ak4GenJets,
ak8GenJets)
recoAllGenJets=cms.Sequence(recoAllGenJetsTask)

recoAllGenJetsNoNu=cms.Sequence(ak4GenJetsNoNu+
recoAllGenJetsNoNuTask=cms.Task(ak4GenJetsNoNu,
ak8GenJetsNoNu)
recoAllGenJetsNoNu=cms.Sequence(recoAllGenJetsNoNuTask)

recoAllGenJetsNoMuNoNu=cms.Sequence(ak4GenJetsNoMuNoNu+
recoAllGenJetsNoMuNoNuTask=cms.Task(ak4GenJetsNoMuNoNu,
ak8GenJetsNoMuNoNu)
recoAllGenJetsNoMuNoNu=cms.Sequence(recoAllGenJetsNoMuNoNuTask)
9 changes: 5 additions & 4 deletions RecoJets/Configuration/python/RecoJPTJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
from RecoJets.JetPlusTracks.JetPlusTrackCorrections_cff import *
JetPlusTrackZSPCorJetAntiKt4.ptCUT = 15.

#define jetPlusTrackZSPCorJet sequences
jetPlusTrackZSPCorJetAntiKt4 = cms.Sequence(JetPlusTrackCorrectionsAntiKt4)

recoJPTJets=cms.Sequence(jetPlusTrackZSPCorJetAntiKt4)
#define jetPlusTrackZSPCorJe Task
jetPlusTrackZSPCorJetAntiKt4Task = cms.Task(JetPlusTrackCorrectionsAntiKt4Task)

recoJPTJetsTask=cms.Task(jetPlusTrackZSPCorJetAntiKt4Task)
recoJPTJets=cms.Sequence(recoJPTJetsTask)
6 changes: 4 additions & 2 deletions RecoJets/Configuration/python/RecoJetAssociations_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@
from RecoJets.JetAssociationProducers.kt4JTA_cff import *
from RecoJets.JetAssociationProducers.ak4JTA_cff import *
from RecoJets.JetAssociationProducers.ak7JTA_cff import *
recoJetAssociations = cms.Sequence(ak4JTA)
recoJetAssociationsExplicit = cms.Sequence(ak4JTAExplicit)
recoJetAssociationsTask = cms.Task(ak4JTATask)
recoJetAssociations = cms.Sequence(recoJetAssociationsTask)
recoJetAssociationsExplicitTask = cms.Task(ak4JTAExplicitTask)
recoJetAssociationsExplicit = cms.Sequence(recoJetAssociationsExplicitTask)
3 changes: 2 additions & 1 deletion RecoJets/Configuration/python/RecoJetsGR_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
# Standard set:
from RecoJets.Configuration.RecoJets_cff import *

recoJetsGR = cms.Sequence(fixedGridRhoFastjetAllCalo+ak4CaloJets)
recoJetsGRTask = cms.Task(fixedGridRhoFastjetAllCalo, ak4CaloJets)
recoJetsGR = cms.Sequence(recoJetsGRTask)

24 changes: 16 additions & 8 deletions RecoJets/Configuration/python/RecoJetsGlobal_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@
from RecoJets.Configuration.RecoJPTJets_cff import *
from JetMETCorrections.Configuration.JetCorrectorsForReco_cff import *

jetGlobalReco = cms.Sequence(recoJets*recoJetIds*recoTrackJets)
jetHighLevelReco = cms.Sequence(recoPFJets*jetCorrectorsForReco*recoJetAssociations*recoJetAssociationsExplicit*recoJPTJets)
jetGlobalRecoTask = cms.Task(recoJetsTask,
recoJetIdsTask,
recoTrackJetsTask)
jetGlobalReco = cms.Sequence(jetGlobalRecoTask)
jetHighLevelRecoTask = cms.Task(recoPFJetsTask,
jetCorrectorsForRecoTask,
recoJetAssociationsTask,
recoJetAssociationsExplicitTask,
recoJPTJetsTask)
jetHighLevelReco = cms.Sequence(jetHighLevelRecoTask)

from RecoHI.HiJetAlgos.hiFJGridEmptyAreaCalculator_cff import hiFJGridEmptyAreaCalculator
from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer
Expand All @@ -19,12 +27,12 @@
from RecoHI.HiCentralityAlgos.pACentrality_cfi import pACentrality
pA_2016.toModify(pACentrality, producePixelTracks = False)

_jetHighLevelReco_pA = jetHighLevelReco.copy()
_jetHighLevelReco_pA += kt4PFJetsForRho
_jetHighLevelReco_pA += hiFJRhoProducer
_jetHighLevelReco_pA += hiFJGridEmptyAreaCalculator
_jetHighLevelReco_pA += pACentrality
pA_2016.toReplaceWith(jetHighLevelReco, _jetHighLevelReco_pA)
_jetHighLevelReco_pATask = jetHighLevelRecoTask.copy()
_jetHighLevelReco_pATask.add(kt4PFJetsForRho)
_jetHighLevelReco_pATask.add(hiFJRhoProducer)
_jetHighLevelReco_pATask.add(hiFJGridEmptyAreaCalculator)
_jetHighLevelReco_pATask.add(pACentrality)
pA_2016.toReplaceWith(jetHighLevelRecoTask, _jetHighLevelReco_pATask)

_jetGlobalReco_HI = cms.Sequence(recoJetsHI*recoJetIds)
_jetHighLevelReco_HI = cms.Sequence(recoPFJetsHI*jetCorrectorsForReco*recoJetAssociations)
Expand Down
28 changes: 14 additions & 14 deletions RecoJets/Configuration/python/RecoJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
maxRapidity = cms.double(2.5)
)

recoJets =cms.Sequence(fixedGridRhoFastjetAllCalo+
fixedGridRhoFastjetCentralCalo+
ak4CaloJets
)

recoAllJets=cms.Sequence(fixedGridRhoFastjetAllCalo+
fixedGridRhoFastjetCentralCalo+
fixedGridRhoFastjetAllCalo+
ak4CaloJets
)


recoAllJetsPUOffsetCorr=cms.Sequence(fixedGridRhoFastjetAllCalo+
fixedGridRhoFastjetCentralCalo+
recoJetsTask =cms.Task(fixedGridRhoFastjetAllCalo,
fixedGridRhoFastjetCentralCalo,
ak4CaloJets)
recoJets =cms.Sequence(recoJetsTask)

recoAllJetsTask=cms.Task(fixedGridRhoFastjetAllCalo,
fixedGridRhoFastjetCentralCalo,
fixedGridRhoFastjetAllCalo,
ak4CaloJets)
recoAllJets=cms.Sequence(recoAllJetsTask)

recoAllJetsPUOffsetCorrTask=cms.Task(fixedGridRhoFastjetAllCalo,
fixedGridRhoFastjetCentralCalo,
ak4CaloJetsPUCorr)
recoAllJetsPUOffsetCorr=cms.Sequence(recoAllJetsPUOffsetCorrTask)

from RecoHI.HiJetAlgos.HiRecoJets_cff import caloTowersRec, caloTowers, akPu4CaloJets

Expand Down
11 changes: 6 additions & 5 deletions RecoJets/Configuration/python/RecoPFClusterJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from RecoJets.JetProducers.ak5PFClusterJets_cfi import ak5PFClusterJets
from RecoJets.JetProducers.PFClustersForJets_cff import *



recoPFClusterJets =cms.Sequence(pfClusterRefsForJetsHCAL+pfClusterRefsForJetsECAL+pfClusterRefsForJets+ak5PFClusterJets)

recoAllPFClusterJets=cms.Sequence(pfClusterRefsForJetsHCAL+pfClusterRefsForJetsECAL+pfClusterRefsForJets+ak5PFClusterJets)
recoPFClusterJetsTask =cms.Task(pfClusterRefsForJetsHCAL,
pfClusterRefsForJetsECAL,
pfClusterRefsForJets,
ak5PFClusterJets)
recoPFClusterJets =cms.Sequence(recoPFClusterJetsTask)
recoAllPFClusterJets=cms.Sequence(recoPFClusterJetsTask)
14 changes: 7 additions & 7 deletions RecoJets/Configuration/python/RecoTrackJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
from CommonTools.RecoAlgos.TrackWithVertexRefSelector_cfi import *
from RecoJets.JetProducers.TracksForJets_cff import *

recoTrackJetsTask =cms.Task(trackWithVertexRefSelector,
trackRefsForJets,
ak4TrackJets )
recoTrackJets =cms.Sequence(recoTrackJetsTask)

recoTrackJets =cms.Sequence(trackWithVertexRefSelector+
trackRefsForJets+
ak4TrackJets
)

recoAllTrackJets=cms.Sequence(trackWithVertexRefSelector+
trackRefsForJets+
recoAllTrackJets=cms.Task(trackWithVertexRefSelector,
trackRefsForJets,
ak4TrackJets)
recoAllTrackJets=cms.Sequence(recoAllTrackJets)
3 changes: 2 additions & 1 deletion RecoJets/JetAssociationProducers/python/ak4JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@
ak4JetTracksAssociatorAtCaloFace,ak4JetExtender)
ak4JTA = cms.Sequence(ak4JTATask)

ak4JTAExplicit = cms.Sequence(ak4JetTracksAssociatorExplicit)
ak4JTAExplicitTask = cms.Task(ak4JetTracksAssociatorExplicit)
ak4JTAExplicit = cms.Sequence(ak4JTAExplicitTask)
13 changes: 8 additions & 5 deletions RecoJets/JetAssociationProducers/python/ak5JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@
coneSize = cms.double(0.5)
)

ak5JTA = cms.Sequence(ak5JetTracksAssociatorAtVertexPF*
ak5JetTracksAssociatorAtVertex*
ak5JetTracksAssociatorAtCaloFace*ak5JetExtender)

ak5JTAExplicit = cms.Sequence(ak5JetTracksAssociatorExplicit)
ak5JTATask = cms.Task(ak5JetTracksAssociatorAtVertexPF,
ak5JetTracksAssociatorAtVertex,
ak5JetTracksAssociatorAtCaloFace,
ak5JetExtender)
ak5JTA = cms.Sequence(ak5JTATask)

ak5JTAExplicitTask = cms.Task(ak5JetTracksAssociatorExplicit)
ak5JTAExplicit = cms.Sequence(ak5JTAExplicitTask)
7 changes: 5 additions & 2 deletions RecoJets/JetAssociationProducers/python/ak7JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@
coneSize = cms.double(0.7)
)

ak7JTA = cms.Sequence(ak7JetTracksAssociatorAtVertexPF*ak7JetTracksAssociatorAtVertex*ak7JetTracksAssociatorAtCaloFace*ak7JetExtender)

ak7JTATask = cms.Task(ak7JetTracksAssociatorAtVertexPF,
ak7JetTracksAssociatorAtVertex,
ak7JetTracksAssociatorAtCaloFace,
ak7JetExtender)
ak7JTA = cms.Sequence(ak7JTATask)
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/python/iterativeCone5JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
coneSize = cms.double(0.5)
)

iterativeCone5JTA = cms.Sequence(iterativeCone5JetTracksAssociatorAtVertex*iterativeCone5JetTracksAssociatorAtCaloFace*iterativeCone5JetExtender)

iterativeCone5JTATask = cms.Task(iterativeCone5JetTracksAssociatorAtVertex,
iterativeCone5JetTracksAssociatorAtCaloFace,
iterativeCone5JetExtender)
iterativeCone5JTA = cms.Sequence(iterativeCone5JTATask)
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/python/kt4JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
coneSize = cms.double(0.5)
)

kt4JTA = cms.Sequence(kt4JetTracksAssociatorAtVertex*kt4JetTracksAssociatorAtCaloFace*kt4JetExtender)

kt4JTATask = cms.Task(kt4JetTracksAssociatorAtVertex,
kt4JetTracksAssociatorAtCaloFace,
kt4JetExtender)
kt4JTA = cms.Sequence(kt4JTATask)
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/python/midPointCone5JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
coneSize = cms.double(0.5)
)

midPointCone5JTA = cms.Sequence(midPointCone5JetTracksAssociatorAtVertex*midPointCone5JetTracksAssociatorAtCaloFace*midPointCone5JetExtender)

midPointCone5JTATask = cms.Task(midPointCone5JetTracksAssociatorAtVertex,
midPointCone5JetTracksAssociatorAtCaloFace,
midPointCone5JetExtender)
midPointCone5JTA = cms.Sequence(midPointCone5JTATask)
6 changes: 4 additions & 2 deletions RecoJets/JetAssociationProducers/python/sisCone5JTA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
coneSize = cms.double(0.5)
)

sisCone5JTA = cms.Sequence(sisCone5JetTracksAssociatorAtVertex*sisCone5JetTracksAssociatorAtCaloFace*sisCone5JetExtender)

sisCone5JTATask = cms.Task(sisCone5JetTracksAssociatorAtVertex,
sisCone5JetTracksAssociatorAtCaloFace,
sisCone5JetExtender)
sisCone5JTA = cms.Sequence(sisCone5JTATask)
45 changes: 25 additions & 20 deletions RecoJets/JetPlusTracks/python/JetPlusTrackCorrectionsAA_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,47 +162,52 @@
JPTAntiKtPu5JetExtender.jet2TracksAtCALO = cms.InputTag("JPTAntiKtPu5JetTracksAssociatorAtCaloFace")
JPTAntiKtPu5JetExtender.jet2TracksAtVX = cms.InputTag("JPTAntiKtPu5JetTracksAssociatorAtVertex")

### ---------- Sequences
### ---------- Task, Sequences

# IC5

JPTrecoJetAssociationsIconePu5 = cms.Sequence(
trackExtrapolator*
### JPTtrackExtrapolatorAA*
JPTiterativeConePu5JetTracksAssociatorAtVertex*
JPTiterativeConePu5JetTracksAssociatorAtCaloFace*
JPTrecoJetAssociationsIconePu5Task = cms.Task(
trackExtrapolator,
JPTiterativeConePu5JetTracksAssociatorAtVertex,
JPTiterativeConePu5JetTracksAssociatorAtCaloFace,
JPTiterativeConePu5JetExtender
)
JPTrecoJetAssociationsIconePu5 = cms.Sequence(JPTrecoJetAssociationsIconePu5Task)

JetPlusTrackCorrectionsIconePu5 = cms.Sequence(
JPTrecoJetAssociationsIconePu5*
JetPlusTrackCorrectionsIconePu5Task = cms.Task(
JPTrecoJetAssociationsIconePu5,
JetPlusTrackZSPCorJetIconePu5
)
JetPlusTrackCorrectionsIconePu5 = cms.Sequence(JetPlusTrackCorrectionsIconePu5Task)

# SC5

JPTrecoJetAssociationsSisConePu5 = cms.Sequence(
trackExtrapolator*
JPTSisConePu5JetTracksAssociatorAtVertex*
JPTSisConePu5JetTracksAssociatorAtCaloFace*
JPTrecoJetAssociationsSisConePu5Task = cms.Task(
trackExtrapolator,
JPTSisConePu5JetTracksAssociatorAtVertex,
JPTSisConePu5JetTracksAssociatorAtCaloFace,
JPTSisConePu5JetExtender
)
JPTrecoJetAssociationsSisConePu5 = cms.Sequence(JPTrecoJetAssociationsSisConePu5Task)

JetPlusTrackCorrectionsSisConePu5 = cms.Sequence(
JPTrecoJetAssociationsSisConePu5*
JetPlusTrackCorrectionsSisConePu5Task = cms.Task(
JPTrecoJetAssociationsSisConePu5,
JetPlusTrackZSPCorJetSisconePu5
)
JetPlusTrackCorrectionsSisConePu5 = cms.Sequence(JetPlusTrackCorrectionsSisConePu5Task)

# Anti-Kt

JPTrecoJetAssociationsAntiKtPu5 = cms.Sequence(
trackExtrapolator*
JPTAntiKtPu5JetTracksAssociatorAtVertex*
JPTAntiKtPu5JetTracksAssociatorAtCaloFace*
JPTrecoJetAssociationsAntiKtPu5Task = cms.Task(
trackExtrapolator,
JPTAntiKtPu5JetTracksAssociatorAtVertex,
JPTAntiKtPu5JetTracksAssociatorAtCaloFace,
JPTAntiKtPu5JetExtender
)
JPTrecoJetAssociationsAntiKtPu5 = cms.Sequence(JPTrecoJetAssociationsAntiKtPu5Task)

JetPlusTrackCorrectionsAntiKtPu5 = cms.Sequence(
JPTrecoJetAssociationsAntiKtPu5*
JetPlusTrackCorrectionsAntiKtPu5Task = cms.Task(
JPTrecoJetAssociationsAntiKtPu5,
JetPlusTrackZSPCorJetAntiKtPu5
)
JetPlusTrackCorrectionsAntiKtPu5 = cms.Sequence(JetPlusTrackCorrectionsAntiKtPu5Task)
32 changes: 16 additions & 16 deletions RecoJets/JetProducers/python/PFClustersForJets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
# src = cms.VInputTag("pfClusterRefsForJetsHCAL", "pfClusterRefsForJetsECAL","pfClusterRefsForJetsHF")
)

pfClusterRefsForJets_step = cms.Sequence(
particleFlowRecHitECAL*
particleFlowRecHitHBHE*
particleFlowRecHitHF*
particleFlowRecHitHO*
particleFlowClusterECALUncorrected*
particleFlowClusterECAL*
particleFlowClusterHBHE*
particleFlowClusterHCAL*
particleFlowClusterHF*
particleFlowClusterHO*

pfClusterRefsForJetsHCAL*
pfClusterRefsForJetsECAL*
pfClusterRefsForJetsHF*
pfClusterRefsForJetsHO*
pfClusterRefsForJets_stepTask = cms.Task(
particleFlowRecHitECAL,
particleFlowRecHitHBHE,
particleFlowRecHitHF,
particleFlowRecHitHO,
particleFlowClusterECALUncorrected,
particleFlowClusterECAL,
particleFlowClusterHBHE,
particleFlowClusterHCAL,
particleFlowClusterHF,
particleFlowClusterHO,
pfClusterRefsForJetsHCAL,
pfClusterRefsForJetsECAL,
pfClusterRefsForJetsHF,
pfClusterRefsForJetsHO,
pfClusterRefsForJets
)
pfClusterRefsForJets_step = cms.Sequence(pfClusterRefsForJets_stepTask)
Loading