Merge pull request #33201 from jeongeun/common112Xupdates

drop type spec and move sequence to task in CommonTools
cms-sw · Mar 19, 2021 · 6cc5d9b · 6cc5d9b
2 parents c7e8c5b + 9832dd4
commit 6cc5d9b
Show file tree

Hide file tree

Showing 27 changed files with 436 additions and 380 deletions.
diff --git a/CommonTools/ParticleFlow/python/EITopPAG_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_cff.py
@@ -112,7 +112,8 @@
 pfJetsEI = pfJets.clone()
 pfJetsPtrsEI = pfJetsPtrs.clone( src = "pfJetsEI" )
 
-pfJetSequenceEI = cms.Sequence( pfJetsEI+ pfJetsPtrsEI )
+pfJetTaskEI = cms.Task( pfJetsEI, pfJetsPtrsEI )
+pfJetSequenceEI = cms.Sequence( pfJetTaskEI )
 
 pfNoJetEI = pfNoJet.clone(
     topCollection = 'pfJetsPtrsEI',
@@ -127,12 +128,13 @@
     bottomCollection = 'pfJetsPtrsEI'
 )
 
-pfTauEISequence = cms.Sequence(
-    pfTausPreSequence+
-    pfTausBaseSequence+
-    pfTausEI+
+pfTauEITask = cms.Task(
+    pfTausPreTask,
+    pfTausBaseTask,
+    pfTausEI,
     pfTausPtrsEI
     )
+pfTauEISequence = cms.Sequence(pfTauEITask)
 
 #### B-tagging ####
 pfImpactParameterTagInfosEI = pfImpactParameterTagInfos.clone(
@@ -151,30 +153,31 @@
 #### MET ####
 pfMetEI = pfMET.clone(srcJets="pfJetsEI")
 
-#EITopPAG = cms.Sequence(
-EIsequence = cms.Sequence(
-    goodOfflinePrimaryVertices +
-    pfPileUpEI +
-    pfPileUpJMEEI +
-    pfNoPileUpEI +
-    pfNoPileUpJMEEI +
-    pfAllMuonsEI +
-    pfMuonsFromVertexEI +
-    pfIsolatedMuonsEI +
-    pfNoMuon +
-    pfNoMuonJME +
-    pfAllElectronsEI +
-    pfElectronsFromVertexEI +
-    pfIsolatedElectronsEI +
-    pfNoElectron +
-    pfNoElectronJME +
-    pfJetSequenceEI +
-    pfNoJetEI +
-    pfTauEISequence +
-    pfNoTauEI +
-    pfMetEI+
-    pfImpactParameterTagInfosEI+
-    pfInclusiveSecondaryVertexFinderTagInfosEI+
+#EITopPAG = cms.Task(
+EITask = cms.Task(
+    goodOfflinePrimaryVertices ,
+    pfPileUpEI ,
+    pfPileUpJMEEI ,
+    pfNoPileUpEI ,
+    pfNoPileUpJMEEI ,
+    pfAllMuonsEI ,
+    pfMuonsFromVertexEI ,
+    pfIsolatedMuonsEI ,
+    pfNoMuon ,
+    pfNoMuonJME ,
+    pfAllElectronsEI ,
+    pfElectronsFromVertexEI ,
+    pfIsolatedElectronsEI ,
+    pfNoElectron ,
+    pfNoElectronJME ,
+    pfJetTaskEI ,
+    pfNoJetEI ,
+    pfTauEITask ,
+    pfNoTauEI ,
+    pfMetEI,
+    pfImpactParameterTagInfosEI,
+    pfInclusiveSecondaryVertexFinderTagInfosEI,
     pfCombinedInclusiveSecondaryVertexV2BJetTagsEI
     )
+EIsequence = cms.Sequence(EITask)
 
diff --git a/CommonTools/ParticleFlow/python/GeneratorTools/genMetTrue_cff.py b/CommonTools/ParticleFlow/python/GeneratorTools/genMetTrue_cff.py
@@ -16,7 +16,7 @@
     4000012, 9900012, 9900014,
     9900016, 39, 12, 14, 16
     )
-    )                   
+)                   
 
 genMetTrue = cms.EDProducer("GenMETProducer",
     src = cms.InputTag("genParticlesForMETAllVisible"), ## Input  product label       
@@ -27,7 +27,8 @@
     applyFiducialThresholdForFractions   = cms.bool(False),
 )
 
-genMetTrueSequence = cms.Sequence(
-    genParticlesForMETAllVisible *
+genMetTrueTask = cms.Task(
+    genParticlesForMETAllVisible ,
     genMetTrue
     )
+genMetTrueSequence = cms.Sequence(genMetTrueTask)
diff --git a/CommonTools/ParticleFlow/python/Isolation/electronPFIsolationDepositsPFBRECO_cff.py b/CommonTools/ParticleFlow/python/Isolation/electronPFIsolationDepositsPFBRECO_cff.py
@@ -24,16 +24,17 @@
                                             DepositLabel = cms.untracked.string('')
                                             )
                                     )
-elPFIsoDepositChargedPFBRECO.ExtractorPSet.DR_Veto = cms.double(0)
-elPFIsoDepositChargedAllPFBRECO.ExtractorPSet.DR_Veto = cms.double(0)
-elPFIsoDepositNeutralPFBRECO.ExtractorPSet.DR_Veto = cms.double(0)
-elPFIsoDepositPUPFBRECO.ExtractorPSet.DR_Veto = cms.double(0)
+elPFIsoDepositChargedPFBRECO.ExtractorPSet.DR_Veto = 0
+elPFIsoDepositChargedAllPFBRECO.ExtractorPSet.DR_Veto = 0
+elPFIsoDepositNeutralPFBRECO.ExtractorPSet.DR_Veto = 0
+elPFIsoDepositPUPFBRECO.ExtractorPSet.DR_Veto = 0
 
 
-electronPFIsolationDepositsPFBRECOSequence = cms.Sequence(
-    elPFIsoDepositChargedPFBRECO+
-    elPFIsoDepositChargedAllPFBRECO+
-    elPFIsoDepositGammaPFBRECO+
-    elPFIsoDepositNeutralPFBRECO+
+electronPFIsolationDepositsPFBRECOTask = cms.Task(
+    elPFIsoDepositChargedPFBRECO,
+    elPFIsoDepositChargedAllPFBRECO,
+    elPFIsoDepositGammaPFBRECO,
+    elPFIsoDepositNeutralPFBRECO,
     elPFIsoDepositPUPFBRECO
     )
+electronPFIsolationDepositsPFBRECOSequence = cms.Sequence(electronPFIsolationDepositsPFBRECOTask)
diff --git a/CommonTools/ParticleFlow/python/Isolation/electronPFIsolationValuesPFBRECO_cff.py b/CommonTools/ParticleFlow/python/Isolation/electronPFIsolationValuesPFBRECO_cff.py
@@ -2,36 +2,36 @@
 
 from RecoParticleFlow.PFProducer.electronPFIsolationValues_cff import *
 
-elPFIsoValueCharged03PFIdPFBRECO = elPFIsoValueCharged03PFId.clone()
-elPFIsoValueCharged03PFIdPFBRECO.deposits[0].src = 'elPFIsoDepositChargedPFBRECO'
-
-elPFIsoValueChargedAll03PFIdPFBRECO = elPFIsoValueChargedAll03PFId.clone()
-elPFIsoValueChargedAll03PFIdPFBRECO.deposits[0].src = 'elPFIsoDepositChargedAllPFBRECO'
-
-elPFIsoValueGamma03PFIdPFBRECO = elPFIsoValueGamma03PFId.clone()
-elPFIsoValueGamma03PFIdPFBRECO.deposits[0].src = 'elPFIsoDepositGammaPFBRECO'
-
-elPFIsoValueNeutral03PFIdPFBRECO = elPFIsoValueNeutral03PFId.clone()
-elPFIsoValueNeutral03PFIdPFBRECO.deposits[0].src = 'elPFIsoDepositNeutralPFBRECO'
-
-elPFIsoValuePU03PFIdPFBRECO = elPFIsoValuePU03PFId.clone()
-elPFIsoValuePU03PFIdPFBRECO.deposits[0].src = 'elPFIsoDepositPUPFBRECO'
-
-elPFIsoValueCharged04PFIdPFBRECO = elPFIsoValueCharged03PFIdPFBRECO.clone()
-elPFIsoValueCharged04PFIdPFBRECO.deposits[0].deltaR = cms.double(0.4)
-
-elPFIsoValueChargedAll04PFIdPFBRECO = elPFIsoValueChargedAll03PFIdPFBRECO.clone()
-elPFIsoValueChargedAll04PFIdPFBRECO.deposits[0].deltaR = cms.double(0.4)
-
-elPFIsoValueGamma04PFIdPFBRECO = elPFIsoValueGamma03PFIdPFBRECO.clone()
-elPFIsoValueGamma04PFIdPFBRECO.deposits[0].deltaR = cms.double(0.4)
-
-elPFIsoValueNeutral04PFIdPFBRECO = elPFIsoValueNeutral03PFIdPFBRECO.clone()
-elPFIsoValueNeutral04PFIdPFBRECO.deposits[0].deltaR = cms.double(0.4)
-
-elPFIsoValuePU04PFIdPFBRECO = elPFIsoValuePU03PFIdPFBRECO.clone()
-elPFIsoValuePU04PFIdPFBRECO.deposits[0].deltaR = cms.double(0.4)
-
+elPFIsoValueCharged03PFIdPFBRECO = elPFIsoValueCharged03PFId.clone(
+    deposits = {0: dict(src = 'elPFIsoDepositChargedPFBRECO')}
+)
+elPFIsoValueChargedAll03PFIdPFBRECO = elPFIsoValueChargedAll03PFId.clone(
+    deposits = {0: dict(src = 'elPFIsoDepositChargedAllPFBRECO')}
+)
+elPFIsoValueGamma03PFIdPFBRECO = elPFIsoValueGamma03PFId.clone(
+    deposits = {0: dict(src = 'elPFIsoDepositGammaPFBRECO')}
+)
+elPFIsoValueNeutral03PFIdPFBRECO = elPFIsoValueNeutral03PFId.clone(
+    deposits = {0: dict(src = 'elPFIsoDepositNeutralPFBRECO')}
+)
+elPFIsoValuePU03PFIdPFBRECO = elPFIsoValuePU03PFId.clone(
+    deposits = {0: dict(src = 'elPFIsoDepositPUPFBRECO')}
+)
+elPFIsoValueCharged04PFIdPFBRECO = elPFIsoValueCharged03PFIdPFBRECO.clone(
+    deposits = {0: dict(deltaR = 0.4)}
+)
+elPFIsoValueChargedAll04PFIdPFBRECO = elPFIsoValueChargedAll03PFIdPFBRECO.clone(
+    deposits = {0: dict(deltaR = 0.4)}
+)
+elPFIsoValueGamma04PFIdPFBRECO = elPFIsoValueGamma03PFIdPFBRECO.clone(
+    deposits = {0: dict(deltaR = 0.4)}
+)
+elPFIsoValueNeutral04PFIdPFBRECO = elPFIsoValueNeutral03PFIdPFBRECO.clone(
+    deposits = {0: dict(deltaR = 0.4)}
+)
+elPFIsoValuePU04PFIdPFBRECO = elPFIsoValuePU03PFIdPFBRECO.clone(
+    deposits = {0: dict(deltaR = 0.4)}
+)
 ##########Now the PFNoId
 elPFIsoValueCharged03NoPFIdPFBRECO     =  elPFIsoValueCharged03PFIdPFBRECO.clone()
 elPFIsoValueChargedAll03NoPFIdPFBRECO  =  elPFIsoValueChargedAll03PFIdPFBRECO.clone()
@@ -55,27 +55,29 @@
 #elPFIsoValuePU04NoPFIdPFBRECO.deposits[0].vetos = cms.vstring('EcalBarrel:ConeVeto(0.015)','EcalEndcaps:ConeVeto(0.015)')
 #elPFIsoValueGamma04NoPFIdPFBRECO.deposits[0].vetos = cms.vstring('EcalBarrel:RectangularEtaPhiVeto(-0.02,0.02,-0.5,0.5)','EcalEndcaps:ConeVeto(0.08)')
 
-electronPFIsolationValuesPFBRECOSequence = (
-    elPFIsoValueCharged03PFIdPFBRECO+
-    elPFIsoValueChargedAll03PFIdPFBRECO+
-    elPFIsoValueGamma03PFIdPFBRECO+
-    elPFIsoValueNeutral03PFIdPFBRECO+
-    elPFIsoValuePU03PFIdPFBRECO+
+electronPFIsolationValuesPFBRECOTask = cms.Task(
+    elPFIsoValueCharged03PFIdPFBRECO,
+    elPFIsoValueChargedAll03PFIdPFBRECO,
+    elPFIsoValueGamma03PFIdPFBRECO,
+    elPFIsoValueNeutral03PFIdPFBRECO,
+    elPFIsoValuePU03PFIdPFBRECO,
     ##############################
-    elPFIsoValueCharged04PFIdPFBRECO+
-    elPFIsoValueChargedAll04PFIdPFBRECO+
-    elPFIsoValueGamma04PFIdPFBRECO+
-    elPFIsoValueNeutral04PFIdPFBRECO+
-    elPFIsoValuePU04PFIdPFBRECO+
+    elPFIsoValueCharged04PFIdPFBRECO,
+    elPFIsoValueChargedAll04PFIdPFBRECO,
+    elPFIsoValueGamma04PFIdPFBRECO,
+    elPFIsoValueNeutral04PFIdPFBRECO,
+    elPFIsoValuePU04PFIdPFBRECO,
     ##############################
-    elPFIsoValueCharged03NoPFIdPFBRECO+
-    elPFIsoValueChargedAll03NoPFIdPFBRECO+
-    elPFIsoValueGamma03NoPFIdPFBRECO+
-    elPFIsoValueNeutral03NoPFIdPFBRECO+
-    elPFIsoValuePU03NoPFIdPFBRECO+
+    elPFIsoValueCharged03NoPFIdPFBRECO,
+    elPFIsoValueChargedAll03NoPFIdPFBRECO,
+    elPFIsoValueGamma03NoPFIdPFBRECO,
+    elPFIsoValueNeutral03NoPFIdPFBRECO,
+    elPFIsoValuePU03NoPFIdPFBRECO,
     ##############################
-    elPFIsoValueCharged04NoPFIdPFBRECO+
-    elPFIsoValueChargedAll04NoPFIdPFBRECO+
-    elPFIsoValueGamma04NoPFIdPFBRECO+
-    elPFIsoValueNeutral04NoPFIdPFBRECO+
+    elPFIsoValueCharged04NoPFIdPFBRECO,
+    elPFIsoValueChargedAll04NoPFIdPFBRECO,
+    elPFIsoValueGamma04NoPFIdPFBRECO,
+    elPFIsoValueNeutral04NoPFIdPFBRECO,
     elPFIsoValuePU04NoPFIdPFBRECO)
+
+electronPFIsolationValuesPFBRECOSequence = cms.Sequence(electronPFIsolationValuesPFBRECOTask)
diff --git a/CommonTools/ParticleFlow/python/Isolation/muonPFIsolationDepositsPFBRECO_cff.py b/CommonTools/ParticleFlow/python/Isolation/muonPFIsolationDepositsPFBRECO_cff.py
@@ -10,10 +10,11 @@
 muPFIsoDepositGammaPFBRECO=isoDepositReplace('pfSelectedMuonsPFBRECO','pfAllPhotonsPFBRECO')
 muPFIsoDepositPUPFBRECO=isoDepositReplace('pfSelectedMuonsPFBRECO','pfPileUpAllChargedParticlesPFBRECO')
 
-muonPFIsolationDepositsPFBRECOSequence = cms.Sequence(
-    muPFIsoDepositChargedPFBRECO+
-    muPFIsoDepositChargedAllPFBRECO+
-    muPFIsoDepositGammaPFBRECO+
-    muPFIsoDepositNeutralPFBRECO+
+muonPFIsolationDepositsPFBRECOTask = cms.Task(
+    muPFIsoDepositChargedPFBRECO,
+    muPFIsoDepositChargedAllPFBRECO,
+    muPFIsoDepositGammaPFBRECO,
+    muPFIsoDepositNeutralPFBRECO,
     muPFIsoDepositPUPFBRECO
     )
+muonPFIsolationDepositsPFBRECOSequence = cms.Sequence(muonPFIsolationDepositsPFBRECOTask)