Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 0 additions & 1 deletion Configuration/Applications/python/ConfigBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -2489,7 +2489,6 @@ def prepare(self, doChecking = False):
self.pythonCfgCode +="from Configuration.Applications.ConfigBuilder import MassReplaceInputTag\n"
self.pythonCfgCode +="MassReplaceInputTag(process, new=\"rawDataMapperByLabel\", old=\"rawDataCollector\")\n"
MassReplaceInputTag(self.process, new="rawDataMapperByLabel", old="rawDataCollector")

Copy link
Contributor

Choose a reason for hiding this comment

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

this line is now unnecessary.

# special treatment in case of production filter sequence 2/2
if self.productionFilterSequence and not (self._options.pileup=='HiMixEmbGEN'):
self.pythonCfgCode +='# filter all path with the production filter sequence\n'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff import Run3_pp_on_PbPb_approxSiStripClusters_2025
from Configuration.ProcessModifiers.rawSecond_cff import rawSecond

Run3_pp_on_PbPb_approxSiStripClusters_2025_rawSecond = cms.ModifierChain(Run3_pp_on_PbPb_approxSiStripClusters_2025, rawSecond)
24 changes: 22 additions & 2 deletions Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ def SwapKeepAndDrop(l):
'keep DetIds_hltSiStripRawToDigi_*_*'
])

from Configuration.ProcessModifiers.rawSecond_cff import rawSecond
rawSecond.toModify(RAWEventContent,
outputCommands = RAWEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*',
Copy link
Contributor

Choose a reason for hiding this comment

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

Looking forwarrd, do you want to use the rawSecond modifier always in conjunction of approxSiStripClusters? In that case I think you might want to make sure you drop the other version of the approximate clusters. In that case also adding DetIds_hltSiStripRawToDigi_*_* is redundant.

'keep DetIds_hltSiStripRawToDigi_*_*'
])
#
# HLTSCOUT Data Tier definition
#
Expand Down Expand Up @@ -659,7 +665,11 @@ def SwapKeepAndDrop(l):
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])

rawSecond.toModify(FEVTDEBUGEventContent,
outputCommands = FEVTDEBUGEventContent.outputCommands+[
Copy link
Contributor

Choose a reason for hiding this comment

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

as above.

'keep *_hltSiStripClusters2ApproxClustersv1_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])
ticl_v5.toModify(FEVTDEBUGEventContent, outputCommands=FEVTDEBUGEventContent.outputCommands+TICLv5_FEVT.outputCommands)
#
#
Expand Down Expand Up @@ -687,6 +697,11 @@ def SwapKeepAndDrop(l):
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])
rawSecond.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*',
Copy link
Contributor

Choose a reason for hiding this comment

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

as above.

'keep DetIds_hltSiStripRawToDigi_*_*'
])
phase2_tracker.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiPixelClusters_*_*',
Expand Down Expand Up @@ -877,7 +892,12 @@ def SwapKeepAndDrop(l):
'drop FEDRawDataCollection_rawDataRepacker_*_*',
'keep FEDRawDataCollection_rawPrimeDataRepacker_*_*'
])

rawSecond.toModify(REPACKRAWEventContent,
outputCommands = REPACKRAWEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*',
'drop FEDRawDataCollection_rawDataRepacker_*_*',
'keep FEDRawDataCollection_rawPrimeDataRepacker_*_*'
])
REPACKRAWSIMEventContent = cms.PSet(
outputCommands = cms.untracked.vstring(),
splitLevel = cms.untracked.int32(0),
Expand Down
3 changes: 3 additions & 0 deletions Configuration/ProcessModifiers/python/rawSecond_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

rawSecond = cms.Modifier()
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def __init__(self):
'Run3_pp_on_PbPb_approxSiStripClusters_2024',
'Run3_pp_on_PbPb_2025',
'Run3_pp_on_PbPb_approxSiStripClusters_2025',
'Run3_pp_on_PbPb_approxSiStripClusters_2025_rawSecond',
'Run3_dd4hep',
'Run3_DDD',
'Run3_FastSim',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
siStripClusters = _siStripClusterizer.clone()

from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters
from Configuration.ProcessModifiers.rawSecond_cff import rawSecond
from RecoLocalTracker.SiStripClusterizer.SiStripApprox2Clusters_cfi import SiStripApprox2Clusters
SiStripApprox2Clusters.inputApproxClusters = 'SiStripClusters2ApproxClusters'
approxSiStripClusters.toModify(SiStripApprox2Clusters, inputApproxClusters = 'hltSiStripClusters2ApproxClusters')
approxSiStripClusters.toReplaceWith(siStripClusters,SiStripApprox2Clusters)

rawSecond.toModify(SiStripApprox2Clusters, inputApproxClusters = 'hltSiStripClusters2ApproxClustersv1',
v1 = True)
rawSecond.toReplaceWith(siStripClusters,SiStripApprox2Clusters)
##
## Modify for the tau embedding methods cleaning step
##
from Configuration.ProcessModifiers.tau_embedding_cleaning_cff import tau_embedding_cleaning
from TauAnalysis.MCEmbeddingTools.Cleaning_RECO_cff import tau_embedding_siStripClusters_cleaner
tau_embedding_cleaning.toReplaceWith(siStripClusters, tau_embedding_siStripClusters_cleaner)
tau_embedding_cleaning.toReplaceWith(siStripClusters, tau_embedding_siStripClusters_cleaner)