Skip to content

Commit

Permalink
Do not use a Task with SiPixelTemplateStoreESProducer
Browse files Browse the repository at this point in the history
The use of a Task at this time causes to much disruption. Moving
ES modules to Tasks should wait till a dedicated campaign.
  • Loading branch information
Dr15Jones committed Aug 23, 2023
1 parent 96972d3 commit 80533db
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)

###############################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)



Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions Alignment/OfflineValidation/test/eopTreeWriter_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,5 @@
ALCARECOCalCosmicsFilterForSiPixelLorentzAngleMCS *
ALCARECOPixelLATrackFilterRefitMCS *
ALCARECOSiPixelLACalibMCS *
MEtoEDMConvertSiPixelLorentzAngleMCS,
cms.Task(SiPixelTemplateStoreESProducer)
MEtoEDMConvertSiPixelLorentzAngleMCS
)
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,5 @@
ALCARECOCalSignleMuonFilterForSiPixelLorentzAngle *
ALCARECOPixelLATrackFilterRefit *
ALCARECOSiPixelLACalib *
MEtoEDMConvertSiPixelLorentzAngle,
cms.Task(SiPixelTemplateStoreESProducer)
MEtoEDMConvertSiPixelLorentzAngle
)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
+ SiPixelPhase1RecHitsAnalyzer
+ SiPixelPhase1TrackResidualsAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer
+ SiPixelPhase1TrackEfficiencyAnalyzer,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackEfficiencyAnalyzer
)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@
+ SiPixelPhase1ClustersAnalyzer
+ SiPixelPhase1RawDataAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer
+ SiPixelPhase1TrackResidualsAnalyzer,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackResidualsAnalyzer
)

siPixelPhase1OnlineDQM_harvesting = cms.Sequence(
Expand Down Expand Up @@ -150,8 +149,7 @@
+ SiPixelPhase1ClustersAnalyzer
+ SiPixelPhase1RawDataAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer_cosmics
+ SiPixelPhase1TrackResidualsAnalyzer_cosmics,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackResidualsAnalyzer_cosmics
)

## Additional settings for pp_run (Phase 0 test)
Expand Down Expand Up @@ -179,7 +177,6 @@
+ SiPixelPhase1RawDataAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer_pprun
+ SiPixelPhase1TrackResidualsAnalyzer_pprun
+ SiPixelPhase1TrackEfficiencyAnalyzer_pprun,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackEfficiencyAnalyzer_pprun
)

7 changes: 2 additions & 5 deletions DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
+ SiPixelPhase1TrackClustersAnalyzer
+ SiPixelPhase1TrackResidualsAnalyzer
# + SiPixelPhase1GeometryDebugAnalyzer
, cms.Task(SiPixelTemplateStoreESProducer)
)

siPixelPhase1OnlineDQM_harvesting = cms.Sequence(
Expand Down Expand Up @@ -122,8 +121,7 @@
+ SiPixelPhase1ClustersAnalyzer
+ SiPixelPhase1RawDataAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer_cosmics
+ SiPixelPhase1TrackResidualsAnalyzer_cosmics,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackResidualsAnalyzer_cosmics
)

## Additional settings for pp_run
Expand All @@ -146,8 +144,7 @@
+ SiPixelPhase1ClustersAnalyzer
+ SiPixelPhase1RawDataAnalyzer
+ SiPixelPhase1TrackClustersAnalyzer_pprun
+ SiPixelPhase1TrackResidualsAnalyzer_pprun,
cms.Task(SiPixelTemplateStoreESProducer)
+ SiPixelPhase1TrackResidualsAnalyzer_pprun
)

siPixelPhase1OnlineDQM_timing_harvesting = siPixelPhase1OnlineDQM_harvesting.copyAndExclude([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,5 @@
* fastMatchedTrackerRecHits
* fastMatchedTrackerRecHitCombinations
* MeasurementTrackerEvent
* iterTracking,
cms.Task(SiPixelTemplateStoreESProducer)
* iterTracking
)
1 change: 0 additions & 1 deletion RecoHI/HiTracking/python/HighPtTracking_PbPb_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@
, hiPrimTrackCandidates
, hiGlobalPrimTracks
, hiTracksWithQualityTask
, SiPixelTemplateStoreESProducer
)
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
duplicateTrackCandidates,
mergedDuplicateTracks,
duplicateTrackClassifier,
generalTracks,
SiPixelTemplateStoreESProducer
generalTracks
)
generalTracksSequence = cms.Sequence(generalTracksTask)

Expand Down
3 changes: 1 addition & 2 deletions RecoTracker/SpecialSeedGenerators/python/cosmicDC_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 80533db

Please sign in to comment.