Cosmic HeavyIons Update

cms-sw · Dec 22, 2019 · 6054885 · 6054885
1 parent a36e56e
commit 6054885
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 41 deletions.
diff --git a/Configuration/StandardSequences/python/ReconstructionCosmics_cff.py b/Configuration/StandardSequences/python/ReconstructionCosmics_cff.py
@@ -44,51 +44,60 @@
 from RecoEgamma.Configuration.RecoEgammaCosmics_cff import *
 
 # local reco
-trackerCosmics = cms.Sequence(offlineBeamSpot*trackerlocalreco*MeasurementTrackerEvent*tracksP5)
-caloCosmics = cms.Sequence(calolocalrecoCosmics*ecalClustersCosmics)
-caloCosmics_HcalNZS = cms.Sequence(calolocalrecoCosmicsNZS*ecalClustersCosmics)
-muonsLocalRecoCosmics = cms.Sequence(muonlocalreco+muonlocalrecoT0Seg)
+trackerCosmicsTask = cms.Task(offlineBeamSpot,trackerlocalrecoTask,MeasurementTrackerEvent,tracksP5Task)
+trackerCosmics = cms.Sequence(trackerCosmicsTask)
+caloCosmicsTask = cms.Task(calolocalrecoTaskCosmics,ecalClustersCosmicsTask)
+caloCosmics = cms.Sequence(caloCosmicsTask)
+caloCosmics_HcalNZSTask = cms.Task(calolocalrecoTaskCosmicsNZS,ecalClustersCosmicsTask)
+caloCosmics_HcalNZS = cms.Sequence(caloCosmics_HcalNZSTask)
+muonsLocalRecoCosmicsTask = cms.Task(muonlocalrecoTask,muonlocalrecoT0SegTask)
+muonsLocalRecoCosmics = cms.Sequence(muonsLocalRecoCosmicsTask)
 
-localReconstructionCosmics         = cms.Sequence(bunchSpacingProducer*trackerCosmics*caloCosmics*muonsLocalRecoCosmics*vertexrecoCosmics+lumiProducer)
-localReconstructionCosmics_HcalNZS = cms.Sequence(bunchSpacingProducer*trackerCosmics*caloCosmics_HcalNZS*muonsLocalRecoCosmics*vertexrecoCosmics +lumiProducer)
+localReconstructionCosmicsTask         = cms.Task(bunchSpacingProducer,trackerCosmicsTask,caloCosmicsTask,muonsLocalRecoCosmicsTask,vertexrecoCosmicsTask,lumiProducer)
+localReconstructionCosmics         = cms.Sequence(localReconstructionCosmicsTask)
+localReconstructionCosmics_HcalNZSTask = cms.Task(bunchSpacingProducer,trackerCosmicsTask,caloCosmics_HcalNZSTask,muonsLocalRecoCosmicsTask,vertexrecoCosmicsTask,lumiProducer)
+localReconstructionCosmics_HcalNZS = cms.Sequence(localReconstructionCosmics_HcalNZSTask)
 
 
 # global reco
-muonsCosmics = cms.Sequence(muonRecoGR)
-jetsCosmics = cms.Sequence(recoCaloTowersGR*recoJetsGR)
-egammaCosmics = cms.Sequence(egammarecoGlobal_cosmics*egammarecoCosmics_woElectrons)
+muonsCosmicsTask = cms.Task(muonRecoGRTask)
+jetsCosmicsTask = cms.Task(recoCaloTowersGRTask,recoJetsGRTask)
+egammaCosmicsTask = cms.Task(egammarecoGlobal_cosmicsTask,egammarecoCosmics_woElectronsTask)
 
 
 from FWCore.Modules.logErrorHarvester_cfi import *
 
 
-reconstructionCosmics         = cms.Sequence(localReconstructionCosmics*
-                                             beamhaloTracksSeq*
-                                             jetsCosmics*
-                                             muonsCosmics*
-                                             regionalCosmicTracksSeq*
-                                             cosmicDCTracksSeq*
-                                             metrecoCosmics*
-                                             egammaCosmics*
+reconstructionCosmicsTask         = cms.Task(localReconstructionCosmicsTask,
+                                             beamhaloTracksTask,
+                                             jetsCosmicsTask,
+                                             muonsCosmicsTask,
+                                             regionalCosmicTracksTask,
+                                             cosmicDCTracksSeqTask,
+                                             metrecoCosmicsTask,
+                                             egammaCosmicsTask,
                                              logErrorHarvester)
+reconstructionCosmics         = cms.Sequence(reconstructionCosmicsTask)
 #logErrorHarvester should only wait for items produced in the reconstructionCosmics sequence
 _modulesInReconstruction = list()
 reconstructionCosmics.visit(cms.ModuleNamesFromGlobalsVisitor(globals(),_modulesInReconstruction))
 logErrorHarvester.includeModules = cms.untracked.vstring(set(_modulesInReconstruction))
 
-reconstructionCosmics_HcalNZS = cms.Sequence(localReconstructionCosmics_HcalNZS*
-                                             beamhaloTracksSeq*
-                                             jetsCosmics*
-                                             muonsCosmics*
-                                             regionalCosmicTracksSeq*
-                                             cosmicDCTracksSeq*
-                                             metrecoCosmics*
-                                             egammaCosmics*
+reconstructionCosmics_HcalNZSTask = cms.Task(localReconstructionCosmics_HcalNZSTask,
+                                             beamhaloTracksTask,
+                                             jetsCosmicsTask,
+                                             muonsCosmicsTask,
+                                             regionalCosmicTracksTask,
+                                             cosmicDCTracksSeqTask,
+                                             metrecoCosmicsTask,
+                                             egammaCosmicsTask,
                                              logErrorHarvester)
-reconstructionCosmics_woTkBHM = cms.Sequence(localReconstructionCosmics*
-                                             jetsCosmics*
-                                             muonsCosmics*
-                                             regionalCosmicTracksSeq*
-                                             cosmicDCTracksSeq*
-                                             metrecoCosmics*
-                                             egammaCosmics)
+reconstructionCosmics_HcalNZS = cms.Sequence(reconstructionCosmics_HcalNZSTask)
+reconstructionCosmics_woTkBHMTask = cms.Task(localReconstructionCosmicsTask,
+                                             jetsCosmicsTask,
+                                             muonsCosmicsTask,
+                                             regionalCosmicTracksTask,
+                                             cosmicDCTracksSeqTask,
+                                             metrecoCosmicsTask,
+                                             egammaCosmicsTask)
+reconstructionCosmics_woTkBHM = cms.Sequence(reconstructionCosmics_woTkBHMTask)
diff --git a/Configuration/StandardSequences/python/ReconstructionHeavyIons_cff.py b/Configuration/StandardSequences/python/ReconstructionHeavyIons_cff.py
@@ -39,22 +39,22 @@
     src = 'siPixelClustersPreSplitting'
     )
 
-caloReco = cms.Sequence(ecalLocalRecoSequence*hcalLocalRecoSequence)
-muonReco = cms.Sequence(trackerlocalreco+MeasurementTrackerEventPreSplitting+siPixelClusterShapeCachePreSplitting+muonlocalreco)
-localReco = cms.Sequence(bunchSpacingProducer*offlineBeamSpot*muonReco*caloReco*castorreco)
+caloRecoTask = cms.Task(ecalLocalRecoTask,hcalLocalRecoTask)
+muonRecoTask = cms.Task(trackerlocalrecoTask,MeasurementTrackerEventPreSplitting,siPixelClusterShapeCachePreSplitting,muonlocalrecoTask)
+localRecoTask = cms.Task(bunchSpacingProducer,offlineBeamSpot,muonRecoTask,caloRecoTask,castorreco)
 
 #hbherecoMB = hbheprerecoMB.clone()
 #hcalLocalRecoSequenceNZS.replace(hbheprerecoMB,hbherecoMB)
 
-caloRecoNZS = cms.Sequence(caloReco+hcalLocalRecoSequenceNZS)
-localReco_HcalNZS = cms.Sequence(bunchSpacingProducer*offlineBeamSpot*muonReco*caloRecoNZS)
+caloRecoNZSTask = cms.Task(caloRecoTask,hcalLocalRecoTaskNZS)
+localReco_HcalNZSTask = cms.Task(bunchSpacingProducer,offlineBeamSpot,muonRecoTask,caloRecoNZSTask)
 
 #--------------------------------------------------------------------------
 # Main Sequence
-reconstruct_PbPb = cms.Sequence(localReco*CastorFullReco*globalRecoPbPb)
-reconstructionHeavyIons = cms.Sequence(reconstruct_PbPb)
+reconstruct_PbPbTask = cms.Task(localRecoTask,CastorFullRecoTask,globalRecoPbPbTask)
+reconstructionHeavyIons = cms.Sequence(reconstruct_PbPbTask)
 
-reconstructionHeavyIons_HcalNZS = cms.Sequence(localReco_HcalNZS*globalRecoPbPb)
+reconstructionHeavyIons_HcalNZSTask = cms.Task(localReco_HcalNZSTask,globalRecoPbPbTask)
 
 reconstructionHeavyIons_withRegitMu = cms.Sequence(reconstructionHeavyIons*regionalMuonRecoPbPb)
 #--------------------------------------------------------------------------
diff --git a/RecoVertex/Configuration/python/RecoVertexCosmicTracks_cff.py b/RecoVertex/Configuration/python/RecoVertexCosmicTracks_cff.py
@@ -7,5 +7,5 @@
 import RecoVertex.PrimaryVertexProducer.OfflinePrimaryVerticesFromCosmicTracks_cfi
 offlinePrimaryVertices = RecoVertex.PrimaryVertexProducer.OfflinePrimaryVerticesFromCosmicTracks_cfi.offlinePrimaryVerticesFromCosmicTracks.clone()
 
-vertexrecoCosmics = cms.Sequence(offlinePrimaryVertices)
+vertexrecoCosmicsTask = cms.Task(offlinePrimaryVertices)