diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 34313f402cb32..369c332dbaa8e 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -180,7 +180,8 @@ def SwapKeepAndDrop(l): from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters approxSiStripClusters.toModify(RAWEventContent, outputCommands = RAWEventContent.outputCommands+[ - 'keep *_hltSiStripClusters2ApproxClusters_*_*' + 'keep *_hltSiStripClusters2ApproxClusters_*_*', + 'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*' ]) # @@ -622,7 +623,8 @@ def SwapKeepAndDrop(l): FEVTDEBUGEventContent.outputCommands.extend(SimFastTimingFEVTDEBUG.outputCommands) approxSiStripClusters.toModify(FEVTDEBUGEventContent, outputCommands = FEVTDEBUGEventContent.outputCommands+[ - 'keep *_hltSiStripClusters2ApproxClusters_*_*' + 'keep *_hltSiStripClusters2ApproxClusters_*_*', + 'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*' ]) # # @@ -640,7 +642,8 @@ def SwapKeepAndDrop(l): FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_PixelDigiSimLink_*') approxSiStripClusters.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[ - 'keep *_hltSiStripClusters2ApproxClusters_*_*' + 'keep *_hltSiStripClusters2ApproxClusters_*_*', + 'keep DetIdedmEDCollection_hltSiStripRawToDigi_*_*' ]) phase2_muon.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands + ['keep recoMuons_muons1stStep_*_*']) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 43113b3a397c1..803d4e7b7b118 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -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' } @@ -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' } diff --git a/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py b/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py index 56bf9825f1c8f..a712ecaf6fc06 100644 --- a/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py +++ b/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py @@ -58,7 +58,7 @@ 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 @@ -66,7 +66,7 @@ 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')), @@ -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) DigiToApproxClusterRaw = cms.Sequence(DigiToApproxClusterRawTask) diff --git a/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py b/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py index 3d64a8c1c4912..6e3cfe37df872 100644 --- a/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py +++ b/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py @@ -35,6 +35,10 @@ castorDigis, scalersRawToDigi) +from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters +approxSiStripClusters.toModify(RawToDigiTask, + RawToDigiTask.copyAndExclude(siStripDigis)) # in case of the approximate cluster wf don't run the + RawToDigi = cms.Sequence(RawToDigiTask) RawToDigiTask_woGCT = RawToDigiTask.copyAndExclude([gctDigis]) diff --git a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py index 4bbc6e15648d2..1dd478402609d 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py +++ b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py @@ -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")] ) diff --git a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py index 83a33b2313769..885d4d282156a 100644 --- a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py +++ b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py @@ -6,6 +6,12 @@ badPixelFEDChannelCollectionLabels = ['siPixelDigis'], ) +# in case of RAW' (approximated SiStrip clusters) +# take the list of inactive strip labels directly from RAW data +from Configuration.ProcessModifiers.approxSiStripClusters_cff import approxSiStripClusters +approxSiStripClusters.toModify(MeasurementTrackerEvent, + inactiveStripDetectorLabels = ["hltSiStripRawToDigi"]) + # This customization will be removed once we have phase2 pixel digis # Need this line to stop error about missing siPixelDigis from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker @@ -31,4 +37,9 @@ MeasurementTrackerEventPreSplitting = MeasurementTrackerEvent.clone( pixelClusterProducer = 'siPixelClustersPreSplitting' - ) +) + +# in case of RAW' (approximated SiStrip clusters) +# take the list of inactive strip labels directly from RAW data +approxSiStripClusters.toModify(MeasurementTrackerEventPreSplitting, + inactiveStripDetectorLabels = ["hltSiStripRawToDigi"])