diff --git a/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py b/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py index f7bd300f301be..244a1a347dce7 100644 --- a/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py +++ b/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py @@ -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' @@ -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) diff --git a/DQM/EcalMonitorTasks/python/ClusterTask_cfi.py b/DQM/EcalMonitorTasks/python/ClusterTask_cfi.py index cdc3f7c68949c..5fb9b05d8bbb9 100644 --- a/DQM/EcalMonitorTasks/python/ClusterTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/ClusterTask_cfi.py @@ -498,4 +498,3 @@ ) ) ) - diff --git a/DQM/EcalMonitorTasks/src/ClusterTask.cc b/DQM/EcalMonitorTasks/src/ClusterTask.cc index 7ac9405ff99bd..bdac4127d6645 100644 --- a/DQM/EcalMonitorTasks/src/ClusterTask.cc +++ b/DQM/EcalMonitorTasks/src/ClusterTask.cc @@ -81,6 +81,13 @@ namespace ecaldqm { edm::Handle 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 diff --git a/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py index 10b808f976069..b52795ca00d41 100644 --- a/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py @@ -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()) @@ -117,6 +118,7 @@ process.twinMuxStage2Digis.DTTM7_FED_Source = "rawDataRepacker" process.dtunpacker.inputLabel = "rawDataRepacker" process.gtDigis.DaqGtInputTag = "rawDataRepacker" + process.gtStage2Digis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" process.dtDigiMonitor.ResetCycle = 9999 diff --git a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py index a1c4010ec064d..d0a6deb7ce282 100644 --- a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py @@ -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") @@ -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()) @@ -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) diff --git a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py index 9b9d1cdb91d7f..7f172a5619742 100644 --- a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py @@ -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) diff --git a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py index 56e26a6a85787..c5961d3784927 100644 --- a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py @@ -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), @@ -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" ),