Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
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)
28 changes: 25 additions & 3 deletions Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@
#
#
from HLTrigger.Configuration.HLTrigger_EventContent_cff import *
from Configuration.ProcessModifiers.rawSecond_cff import rawSecond
rawSecond.toModify(HLTDebugFEVT,
outputCommands = [x for x in HLTDebugFEVT.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x]+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
rawSecond.toModify(HLTDebugRAW,
outputCommands = [x for x in HLTDebugRAW.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x]+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
from HLTrigger.Configuration.HLTScouting_EventContent_cff import HLTScoutingExtra
# Extend HLT dataformats to the previous scouting objects, to keep them when running on old data/MC
HLTriggerMINIAODSIM.outputCommands.extend(HLTScoutingExtra.outputCommands)
Expand Down Expand Up @@ -189,7 +198,10 @@ def SwapKeepAndDrop(l):
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])

rawSecond.toModify(RAWEventContent,
outputCommands = [x for x in RAWEventContent.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x]+[
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
#
# HLTSCOUT Data Tier definition
#
Expand Down Expand Up @@ -659,7 +671,10 @@ def SwapKeepAndDrop(l):
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])

rawSecond.toModify(FEVTDEBUGEventContent,
outputCommands = [x for x in FEVTDEBUGEventContent.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x] + [
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
ticl_v5.toModify(FEVTDEBUGEventContent, outputCommands=FEVTDEBUGEventContent.outputCommands+TICLv5_FEVT.outputCommands)
#
#
Expand Down Expand Up @@ -687,6 +702,10 @@ def SwapKeepAndDrop(l):
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep DetIds_hltSiStripRawToDigi_*_*'
])
rawSecond.toModify(FEVTDEBUGHLTEventContent,
outputCommands = [x for x in FEVTDEBUGHLTEventContent.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x] + [
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
phase2_tracker.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiPixelClusters_*_*',
Expand Down Expand Up @@ -877,7 +896,10 @@ def SwapKeepAndDrop(l):
'drop FEDRawDataCollection_rawDataRepacker_*_*',
'keep FEDRawDataCollection_rawPrimeDataRepacker_*_*'
])

rawSecond.toModify(REPACKRAWEventContent,
outputCommands = [x for x in REPACKRAWEventContent.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x] + [
'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
])
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)