From e5b395289fa37daa3c79395b51385c60a608205b Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 17 Aug 2023 16:41:13 +0200 Subject: [PATCH] Do not use a Task with SiPixelTemplateStoreESProducer The use of a Task at this time causes to much disruption. Moving ES modules to Tasks should wait till a dedicated campaign. --- .../python/tools/trackselectionRefitting.py | 6 ------ .../python/TkAlAllInOneTool/JetHT_cfg.py | 8 +++----- .../python/TkAlAllInOneTool/SplitV_cfg.py | 4 +--- .../OfflineValidation/test/DiMuonVertexValidation_cfg.py | 4 +--- Alignment/OfflineValidation/test/eopTreeWriter_cfg.py | 4 +--- .../ALCARECOPromptCalibProdSiPixelLorentzAngleMCS_cff.py | 3 +-- .../ALCARECOPromptCalibProdSiPixelLorentzAngle_cff.py | 3 +-- .../python/ALCARECOPromptCalibProdSiStripGainsAAG_cff.py | 3 +-- .../python/ALCARECOSiPixelCalSingleMuonTight_cff.py | 3 +-- .../python/SiPixelPhase1OfflineDQM_source_cff.py | 3 +-- .../python/SiPixelPhase1OnlineDQM_Timing_cff.py | 9 +++------ .../python/SiPixelPhase1OnlineDQM_cff.py | 7 ++----- .../Configuration/python/Reconstruction_BefMix_cff.py | 3 +-- RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py | 1 - .../python/MergeTrackCollections_cff.py | 3 +-- RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py | 3 +-- 16 files changed, 19 insertions(+), 48 deletions(-) diff --git a/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py b/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py index 57ccd748e2c18..948f56d12aee0 100644 --- a/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py +++ b/Alignment/CommonAlignment/python/tools/trackselectionRefitting.py @@ -391,10 +391,6 @@ def getSequence(process, collection, modules.append(getattr(process, src)) moduleSum = process.offlineBeamSpot # first element of the sequence - tasks = [] - if usePixelQualityFlag: - process.load("RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi") - tasks =[process.SiPixelTemplateStoreESProducer] if g4Refitting: # g4Refitter needs measurements moduleSum += getattr(process,"MeasurementTrackerEvent") @@ -425,8 +421,6 @@ def getSequence(process, collection, moduleSum += module # append the other modules - if tasks: - return cms.Sequence(moduleSum, cms.Task(*tasks)) return cms.Sequence(moduleSum) ############################### diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/JetHT_cfg.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/JetHT_cfg.py index 669d3b28a4dd1..14cc483eedcdb 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/JetHT_cfg.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/JetHT_cfg.py @@ -289,19 +289,17 @@ ) -process.load("RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi") if (triggerFilter == "nothing" or triggerFilter == ""): process.p = cms.Path(process.offlineBeamSpot + process.TrackRefitter + process.offlinePrimaryVerticesFromRefittedTrks + - process.jetHTAnalyzer, - cms.Task(process.SiPixelTemplateStoreESProducer)) + process.jetHTAnalyzer) else: process.p = cms.Path(process.HLTFilter + process.offlineBeamSpot + process.TrackRefitter + process.offlinePrimaryVerticesFromRefittedTrks + - process.jetHTAnalyzer, - cms.Task(process.SiPixelTemplateStoreESProducer)) + process.jetHTAnalyzer) + diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/SplitV_cfg.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/SplitV_cfg.py index 342db62706218..00c651df40961 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/SplitV_cfg.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/SplitV_cfg.py @@ -197,12 +197,10 @@ print("Saving the output at %s" % process.TFileService.fileName.value()) -process.load("RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi") process.theValidSequence = cms.Sequence(process.offlineBeamSpot + process.TrackRefitter + process.offlinePrimaryVerticesFromRefittedTrks + - process.PrimaryVertexResolution, - cms.Task(process.SiPixelTemplateStoreESProducer)) + process.PrimaryVertexResolution) HLTSel = config["validation"].get("HLTselection", False) diff --git a/Alignment/OfflineValidation/test/DiMuonVertexValidation_cfg.py b/Alignment/OfflineValidation/test/DiMuonVertexValidation_cfg.py index 1002ff4f9dc71..db6378f119b13 100644 --- a/Alignment/OfflineValidation/test/DiMuonVertexValidation_cfg.py +++ b/Alignment/OfflineValidation/test/DiMuonVertexValidation_cfg.py @@ -228,12 +228,10 @@ def best_match(rcd): #################################################################### # Sequence #################################################################### -process.load("RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi") process.seqTrackselRefit = cms.Sequence(process.offlineBeamSpot* # in case NavigatioSchool is set !='' #process.MeasurementTrackerEvent* - process.TrackRefitter, - cms.Task(process.SiPixelTemplateStoreESProducer)) + process.TrackRefitter) #################################################################### # Re-do vertices diff --git a/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py b/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py index f560948a59c8d..f1e925443543c 100644 --- a/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py +++ b/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py @@ -150,10 +150,8 @@ #################################################################### # Path #################################################################### -process.load("RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi") process.p = cms.Path(process.MeasurementTrackerEvent* process.offlineBeamSpot* process.AlignmentTrackSelector* process.TrackRefitter* - process.energyOverMomentumTree, - cms.Task(process.SiPixelTemplateStoreESProducer)) + process.energyOverMomentumTree) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngleMCS_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngleMCS_cff.py index 9a0358f88c3af..8dee4064975b7 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngleMCS_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngleMCS_cff.py @@ -66,6 +66,5 @@ ALCARECOCalCosmicsFilterForSiPixelLorentzAngleMCS * ALCARECOPixelLATrackFilterRefitMCS * ALCARECOSiPixelLACalibMCS * - MEtoEDMConvertSiPixelLorentzAngleMCS, - cms.Task(SiPixelTemplateStoreESProducer) + MEtoEDMConvertSiPixelLorentzAngleMCS ) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_cff.py index 7fbb485038ee6..f339cda514359 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiPixelLorentzAngle_cff.py @@ -67,6 +67,5 @@ ALCARECOCalSignleMuonFilterForSiPixelLorentzAngle * ALCARECOPixelLATrackFilterRefit * ALCARECOSiPixelLACalib * - MEtoEDMConvertSiPixelLorentzAngle, - cms.Task(SiPixelTemplateStoreESProducer) + MEtoEDMConvertSiPixelLorentzAngle ) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripGainsAAG_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripGainsAAG_cff.py index cf2d4c0223d2d..cf7ccca0cec34 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripGainsAAG_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOPromptCalibProdSiStripGainsAAG_cff.py @@ -67,8 +67,7 @@ from RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi import SiPixelTemplateStoreESProducer ALCARECOTrackFilterRefitAAG = cms.Sequence(ALCARECOCalibrationTracksAAG + offlineBeamSpot + - ALCARECOCalibrationTracksRefitAAG, - cms.Task(SiPixelTemplateStoreESProducer) ) + ALCARECOCalibrationTracksRefitAAG ) # ------------------------------------------------------------------------------ # This is the module actually doing the calibration diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiPixelCalSingleMuonTight_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiPixelCalSingleMuonTight_cff.py index 72f37bf57bb0c..9bed193180521 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiPixelCalSingleMuonTight_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiPixelCalSingleMuonTight_cff.py @@ -78,8 +78,7 @@ ################################################################## from RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi import SiPixelTemplateStoreESProducer ALCARECOSiPixelCalSingleMuonTightOffTrackClusters = cms.Sequence(ALCARECOSiPixelCalSingleMuonTightTracksRefit + - closebyPixelClusters , - cms.Task(SiPixelTemplateStoreESProducer)) + closebyPixelClusters) ################################################################## # Producer of distances value map diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py index 9604c9f4320b8..4c1c917834ae1 100644 --- a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py +++ b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_source_cff.py @@ -39,8 +39,7 @@ + SiPixelPhase1RecHitsAnalyzer + SiPixelPhase1TrackResidualsAnalyzer + SiPixelPhase1TrackClustersAnalyzer - + SiPixelPhase1TrackEfficiencyAnalyzer, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackEfficiencyAnalyzer ) diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_Timing_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_Timing_cff.py index e268b8062f012..f1c4268f8eb2c 100644 --- a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_Timing_cff.py +++ b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_Timing_cff.py @@ -115,8 +115,7 @@ + SiPixelPhase1ClustersAnalyzer + SiPixelPhase1RawDataAnalyzer + SiPixelPhase1TrackClustersAnalyzer - + SiPixelPhase1TrackResidualsAnalyzer, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackResidualsAnalyzer ) siPixelPhase1OnlineDQM_harvesting = cms.Sequence( @@ -150,8 +149,7 @@ + SiPixelPhase1ClustersAnalyzer + SiPixelPhase1RawDataAnalyzer + SiPixelPhase1TrackClustersAnalyzer_cosmics - + SiPixelPhase1TrackResidualsAnalyzer_cosmics, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackResidualsAnalyzer_cosmics ) ## Additional settings for pp_run (Phase 0 test) @@ -179,7 +177,6 @@ + SiPixelPhase1RawDataAnalyzer + SiPixelPhase1TrackClustersAnalyzer_pprun + SiPixelPhase1TrackResidualsAnalyzer_pprun - + SiPixelPhase1TrackEfficiencyAnalyzer_pprun, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackEfficiencyAnalyzer_pprun ) diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py index 5e9cc8a6a9a3b..e5047911f33fa 100644 --- a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py +++ b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py @@ -88,7 +88,6 @@ + SiPixelPhase1TrackClustersAnalyzer + SiPixelPhase1TrackResidualsAnalyzer # + SiPixelPhase1GeometryDebugAnalyzer - , cms.Task(SiPixelTemplateStoreESProducer) ) siPixelPhase1OnlineDQM_harvesting = cms.Sequence( @@ -122,8 +121,7 @@ + SiPixelPhase1ClustersAnalyzer + SiPixelPhase1RawDataAnalyzer + SiPixelPhase1TrackClustersAnalyzer_cosmics - + SiPixelPhase1TrackResidualsAnalyzer_cosmics, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackResidualsAnalyzer_cosmics ) ## Additional settings for pp_run @@ -146,8 +144,7 @@ + SiPixelPhase1ClustersAnalyzer + SiPixelPhase1RawDataAnalyzer + SiPixelPhase1TrackClustersAnalyzer_pprun - + SiPixelPhase1TrackResidualsAnalyzer_pprun, - cms.Task(SiPixelTemplateStoreESProducer) + + SiPixelPhase1TrackResidualsAnalyzer_pprun ) siPixelPhase1OnlineDQM_timing_harvesting = siPixelPhase1OnlineDQM_harvesting.copyAndExclude([ diff --git a/FastSimulation/Configuration/python/Reconstruction_BefMix_cff.py b/FastSimulation/Configuration/python/Reconstruction_BefMix_cff.py index b91aa1dd999e8..eb1d27571f5df 100644 --- a/FastSimulation/Configuration/python/Reconstruction_BefMix_cff.py +++ b/FastSimulation/Configuration/python/Reconstruction_BefMix_cff.py @@ -49,6 +49,5 @@ * fastMatchedTrackerRecHits * fastMatchedTrackerRecHitCombinations * MeasurementTrackerEvent - * iterTracking, - cms.Task(SiPixelTemplateStoreESProducer) + * iterTracking ) diff --git a/RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py b/RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py index a499ad0f192a2..fcbb7b7b1282f 100644 --- a/RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py +++ b/RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py @@ -32,5 +32,4 @@ , hiPrimTrackCandidates , hiGlobalPrimTracks , hiTracksWithQualityTask - , SiPixelTemplateStoreESProducer ) diff --git a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py index 51c6934d93aab..907e3126a5cd7 100644 --- a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py @@ -49,8 +49,7 @@ duplicateTrackCandidates, mergedDuplicateTracks, duplicateTrackClassifier, - generalTracks, - SiPixelTemplateStoreESProducer + generalTracks ) generalTracksSequence = cms.Sequence(generalTracksTask) diff --git a/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py b/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py index 68a500fb115fc..978cb0b9d24ad 100644 --- a/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py +++ b/RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py @@ -52,6 +52,5 @@ ) # Final Sequence -from RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi import SiPixelTemplateStoreESProducer -cosmicDCTracksSeqTask = cms.Task( cosmicDCSeeds , cosmicDCCkfTrackCandidates , cosmicDCTracks , SiPixelTemplateStoreESProducer ) +cosmicDCTracksSeqTask = cms.Task( cosmicDCSeeds , cosmicDCCkfTrackCandidates , cosmicDCTracks ) cosmicDCTracksSeq = cms.Sequence(cosmicDCTracksSeqTask)