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

Remove legacy L1T digis dependencies in Online DQM #46716

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Remove legacy L1T digis dependencies in Online DQM #46716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b3afd7
remove L1T stage1 dependencies from SiStrip_OfflineMonitoring
mmusich Nov 15, 2024
8c7fd9b
use stage2 L1T digis in DT dqm online DQM when appropriate
mmusich Nov 15, 2024
fe46246
workaround to avoid using the legacy gt digis in the Ecal Online DQM
mmusich Nov 16, 2024
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: 6 additions & 0 deletions DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
DaqGtInputTag = 'rawDataCollector'
)

from EventFilter.L1TRawToDigi.gtStage2Digis_cfi import gtStage2Digis
gtStage2Digis.InputLabel = 'rawDataCollector'

# Scalers info
from EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi import *
scalersRawToDigi.scalersInputTag = 'rawDataCollector'
Expand Down Expand Up @@ -122,3 +125,6 @@
# sequence to be run on physics events (includes filters, reco and DQM)
dtDQMPhysSequence = cms.Sequence(dtScalerInfoMonitor + gtDigis + reco + dtDQMTask + dtDQMTest)

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
dtDQMPhysSequenceStage2 = cms.Sequence(dtScalerInfoMonitor + gtStage2Digis + reco + dtDQMTask + dtDQMTest)
stage2L1Trigger.toReplaceWith(dtDQMPhysSequence,dtDQMPhysSequenceStage2)
1 change: 0 additions & 1 deletion DQM/EcalMonitorTasks/python/ClusterTask_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,4 +498,3 @@
)
)
)

7 changes: 7 additions & 0 deletions DQM/EcalMonitorTasks/src/ClusterTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ namespace ecaldqm {

edm::Handle<L1GlobalTriggerReadoutRecord> l1GTHndl;
_evt.getByToken(L1GlobalTriggerReadoutRecordToken_, l1GTHndl);

if (!l1GTHndl.isValid()) {
edm::LogError("L1GlobalTriggerReadoutRecord")
<< "Failed to retrieve L1GlobalTriggerReadoutRecord from the Event!";
return; // Exit the function early if the handle is invalid
}

DecisionWord const& dWord(l1GTHndl->decisionWord());

//Ecal
Expand Down
2 changes: 2 additions & 0 deletions DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
process.twinMuxStage2Digis.DTTM7_FED_Source = "rawDataCollector"
process.dtunpacker.inputLabel = "rawDataCollector"
process.gtDigis.DaqGtInputTag = "rawDataCollector"
process.gtStage2Digis.InputLabel = "rawDataCollector"
process.scalersRawToDigi.scalersInputTag = "rawDataCollector"

print("Running with run type = ", process.runType.getRunType())
Expand Down Expand Up @@ -117,6 +118,7 @@
process.twinMuxStage2Digis.DTTM7_FED_Source = "rawDataRepacker"
process.dtunpacker.inputLabel = "rawDataRepacker"
process.gtDigis.DaqGtInputTag = "rawDataRepacker"
process.gtStage2Digis.InputLabel = "rawDataCollector"
mmusich marked this conversation as resolved.
Show resolved Hide resolved
process.scalersRawToDigi.scalersInputTag = "rawDataRepacker"

process.dtDigiMonitor.ResetCycle = 9999
Expand Down
7 changes: 3 additions & 4 deletions DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# DT reco and DQM sequences
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
process.load("Configuration/StandardSequences/MagneticField_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff")
#---- for P5 (online) DB access
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
Expand All @@ -69,6 +69,7 @@
process.twinMuxStage2Digis.DTTM7_FED_Source = "rawDataCollector"
process.dtunpacker.inputLabel = "rawDataCollector"
process.gtDigis.DaqGtInputTag = "rawDataCollector"
process.gtStage2Digis.InputLabel = "rawDataCollector"
process.scalersRawToDigi.scalersInputTag = "rawDataCollector"

print("Running with run type = ", process.runType.getRunType())
Expand Down Expand Up @@ -97,12 +98,10 @@
process.twinMuxStage2Digis.DTTM7_FED_Source = "rawDataRepacker"
process.dtunpacker.inputLabel = "rawDataRepacker"
process.gtDigis.DaqGtInputTag = "rawDataRepacker"
process.gtStage2Digis.InputLabel = "rawDataRepacker"
process.scalersRawToDigi.scalersInputTag = "rawDataRepacker"

process.dtDigiMonitor.ResetCycle = 9999



### process customizations included here
from DQM.Integration.config.online_customizations_cfi import *
print("Final Source settings:", process.source)
Expand Down
2 changes: 1 addition & 1 deletion DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
### Sequences ###

process.ecalPreRecoSequence = cms.Sequence(process.bunchSpacingProducer + process.ecalDigis)
process.ecalRecoSequence = cms.Sequence((process.ecalMultiFitUncalibRecHit+process.ecalDetIdToBeRecovered+process.ecalRecHit)+(process.simEcalTriggerPrimitiveDigis+process.gtDigis)+(process.hybridClusteringSequence+process.multi5x5ClusteringSequence))
process.ecalRecoSequence = cms.Sequence((process.ecalMultiFitUncalibRecHit+process.ecalDetIdToBeRecovered+process.ecalRecHit)+(process.simEcalTriggerPrimitiveDigis+process.gtStage2Digis)+(process.hybridClusteringSequence+process.multi5x5ClusteringSequence))
process.multi5x5ClusteringSequence = cms.Sequence(process.multi5x5BasicClustersCleaned+process.multi5x5SuperClustersCleaned+process.multi5x5BasicClustersUncleaned+process.multi5x5SuperClustersUncleaned+process.multi5x5SuperClusters)
process.hybridClusteringSequence = cms.Sequence(process.cleanedHybridSuperClusters+process.uncleanedHybridSuperClusters+process.hybridSuperClusters+process.correctedHybridSuperClusters+process.uncleanedOnlyCorrectedHybridSuperClusters)

Expand Down
66 changes: 45 additions & 21 deletions DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,52 @@
HLTSiStripMonitorCluster.TH1StripNoise3ApvCycle.globalswitchon = cms.bool(False)

HLTSiStripMonitorCluster.BPTXfilter = cms.PSet(
andOr = cms.bool( False ),
dbLabel = cms.string("SiStripDQMTrigger"),
l1Algorithms = cms.vstring( 'L1Tech_BPTX_plus_AND_minus.v0', 'L1_ZeroBias' ),
andOrL1 = cms.bool( True ),
errorReplyL1 = cms.bool( True ),
l1BeforeMask = cms.bool( True ) # specifies, if the L1 algorithm decision should be read as before (true) or after (false) masking is applied.
)
andOr = cms.bool( False ),
dbLabel = cms.string("SiStripDQMTrigger"),
l1Algorithms = cms.vstring( 'L1Tech_BPTX_plus_AND_minus.v0', 'L1_ZeroBias' ),
andOrL1 = cms.bool( True ),
errorReplyL1 = cms.bool( True ),
l1BeforeMask = cms.bool( True ) # specifies, if the L1 algorithm decision should be read as before (true) or after (false) masking is applied.
)
HLTSiStripMonitorCluster.PixelDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 28, 29),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
)
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 28, 29),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
)
HLTSiStripMonitorCluster.StripDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
)
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
)

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(HLTSiStripMonitorCluster,
BPTXfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(False)
),
PixelDCSfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(False)
),
StripDCSfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(False)
)
)

HLTSiStripMonitorCluster.TH2CStripVsCpixel = cms.PSet(
Nbinsx = cms.int32(200),
xmin = cms.double(-0.5),
Expand All @@ -74,6 +97,7 @@
xmax = cms.double(99999.5),
xmin = cms.double(-0.5)
)

hltESPPixelCPETemplateReco = cms.ESProducer( "PixelCPETemplateRecoESProducer",
LoadTemplatesFromDB = cms.bool( True ),
ComponentName = cms.string( "hltESPPixelCPETemplateReco" ),
Expand Down