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

RAW' workflow: rename siStripDigisHLT to hltSiStripRawToDigi #42480

Merged
merged 1 commit into from
Aug 10, 2023
Merged

RAW' workflow: rename siStripDigisHLT to hltSiStripRawToDigi #42480

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
6 changes: 3 additions & 3 deletions Configuration/EventContent/python/EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def SwapKeepAndDrop(l):
approxSiStripClusters.toModify(RAWEventContent,
outputCommands = RAWEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIdedmEDCollection_siStripDigisHLT_*_*'
'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*'
])

#
Expand Down Expand Up @@ -624,7 +624,7 @@ def SwapKeepAndDrop(l):
approxSiStripClusters.toModify(FEVTDEBUGEventContent,
outputCommands = FEVTDEBUGEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIdedmEDCollection_siStripDigisHLT_*_*'
'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*'
])
#
#
Expand All @@ -643,7 +643,7 @@ def SwapKeepAndDrop(l):
approxSiStripClusters.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIdedmEDCollection_siStripDigisHLT_*_*'
'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*'
])
phase2_muon.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands + ['keep recoMuons_muons1stStep_*_*'])
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,7 @@ def lhegensim2018ml(fragment,howMuch):
'--era':'Run2_2018_pp_on_AA',
'-n':'10',
'--procModifiers':'approxSiStripClusters',
'--customise_commands':'\"process.siStripDigisHLT.ProductLabel=\'rawDataCollector\';process.hltScalersRawToDigi.scalersInputTag=\'rawDataCollector\'\"',
'--customise_commands':'\"process.hltSiStripRawToDigi.ProductLabel=\'rawDataCollector\';process.hltScalersRawToDigi.scalersInputTag=\'rawDataCollector\'\"',
'--process':'REHLT'
}

Expand Down Expand Up @@ -2199,7 +2199,7 @@ def lhegensim2018ml(fragment,howMuch):
'--eventcontent':'REPACKRAW',
'--era':'Run3_pp_on_PbPb_approxSiStripClusters',
'-n':'10',
'--customise_commands':'\"process.siStripDigisHLT.ProductLabel=\'rawDataCollector\';process.hltScalersRawToDigi.scalersInputTag=\'rawDataCollector\'\"',
'--customise_commands':'\"process.hltSiStripRawToDigi.ProductLabel=\'rawDataCollector\';process.hltScalersRawToDigi.scalersInputTag=\'rawDataCollector\'\"',
'--process':'REHLT'
}

Expand Down
6 changes: 3 additions & 3 deletions Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
DigiToSplitRawRepack = cms.Sequence( DigiToRawRepackTask, DigiToVirginRawRepackTask )

from EventFilter.SiStripRawToDigi.SiStripDigis_cfi import siStripDigis
siStripDigisHLT = siStripDigis.clone(ProductLabel = "rawDataRepacker")
hltSiStripRawToDigi = siStripDigis.clone(ProductLabel = "rawDataRepacker")

from RecoLocalTracker.Configuration.RecoLocalTracker_cff import siStripZeroSuppressionHLT

from RecoLocalTracker.SiStripClusterizer.DefaultClusterizer_cff import *
siStripClustersHLT = cms.EDProducer("SiStripClusterizer",
Clusterizer = DefaultClusterizer,
DigiProducersList = cms.VInputTag(
cms.InputTag('siStripDigisHLT','ZeroSuppressed'),
cms.InputTag('hltSiStripRawToDigi','ZeroSuppressed'),
cms.InputTag('siStripZeroSuppressionHLT','VirginRaw'),
cms.InputTag('siStripZeroSuppressionHLT','ProcessedRaw'),
cms.InputTag('siStripZeroSuppressionHLT','ScopeMode')),
Expand All @@ -84,5 +84,5 @@
scalersInputTag = cms.InputTag( "rawDataRepacker" )
)

DigiToApproxClusterRawTask = cms.Task(siStripDigisHLT,siStripZeroSuppressionHLT,hltScalersRawToDigi,hltBeamSpotProducer,siStripClustersHLT,hltSiStripClusters2ApproxClusters,rawPrimeDataRepacker)
DigiToApproxClusterRawTask = cms.Task(hltSiStripRawToDigi,siStripZeroSuppressionHLT,hltScalersRawToDigi,hltBeamSpotProducer,siStripClustersHLT,hltSiStripClusters2ApproxClusters,rawPrimeDataRepacker)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as a side note, we could actually rename all the HLT mock-up collections:

  • siStripZeroSuppressionHLT -> hltSiStripZeroSuppression
  • siStripClustersHLT -> hltSiStripClusterizerForRawPrime

even though since the event products are not persisted, it's not strictly mandatory to be in synch with the content of the HLT menu. I let the reviewers decide.

DigiToApproxClusterRaw = cms.Sequence(DigiToApproxClusterRawTask)
3 changes: 2 additions & 1 deletion RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
'simSiStripDigis:ScopeMode' ]
)

# For the HI RAW' workflow
siStripZeroSuppressionHLT = siStripZeroSuppression.clone(
RawDigiProducersList =[("siStripDigisHLT","VirginRaw"), ("siStripDigisHLT","ProcessedRaw"), ("siStripDigisHLT","ScopeMode")]
RawDigiProducersList =[("hltSiStripRawToDigi","VirginRaw"), ("hltSiStripRawToDigi","ProcessedRaw"), ("hltSiStripRawToDigi","ScopeMode")]
)

4 changes: 2 additions & 2 deletions RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# take the list of inactive strip labels directly from RAW data
from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
approxSiStripClusters.toModify(MeasurementTrackerEvent,
inactiveStripDetectorLabels = ["siStripDigisHLT"])
inactiveStripDetectorLabels = ["hltSiStripRawToDigi"])

# This customization will be removed once we have phase2 pixel digis
# Need this line to stop error about missing siPixelDigis
Expand Down Expand Up @@ -42,4 +42,4 @@
# in case of RAW' (approximated SiStrip clusters)
# take the list of inactive strip labels directly from RAW data
approxSiStripClusters.toModify(MeasurementTrackerEventPreSplitting,
inactiveStripDetectorLabels = ["siStripDigisHLT"])
inactiveStripDetectorLabels = ["hltSiStripRawToDigi"])