From c21a59c43a8b9181dfffac3025b3c0f712c4f2fb Mon Sep 17 00:00:00 2001 From: rosma Date: Fri, 23 Jun 2023 12:16:54 +0200 Subject: [PATCH] New DQM Offline sequence to be run on Express Stream 13_1_X --- .../python/Harvesting_cff.py | 1 + .../python/DQMOffline_SecondStep_cff.py | 41 +++++++++++++++++++ .../Configuration/python/DQMOffline_cff.py | 41 +++++++++++++++++++ DQMOffline/Configuration/python/autoDQM.py | 4 ++ 4 files changed, 87 insertions(+) diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py index a2e1f4a25a8bc..cd9870fc4a308 100644 --- a/Configuration/StandardSequences/python/Harvesting_cff.py +++ b/Configuration/StandardSequences/python/Harvesting_cff.py @@ -13,6 +13,7 @@ dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification) +dqmHarvestingExpress = cms.Path(DQMOffline_SecondStep_Express) dqmHarvestingExtraHLT = cms.Path(DQMOffline_SecondStep_ExtraHLT*DQMOffline_Certification) dqmHarvestingFakeHLT = cms.Path(DQMOffline_SecondStep_FakeHLT*DQMOffline_Certification) #dqmHarvesting = cms.Sequence(DQMOffline_SecondStep*DQMOffline_Certification) diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py index db82a56e0bce5..b47ddf12be736 100644 --- a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py @@ -31,6 +31,11 @@ rpcTier0Client * cscOfflineCollisionsClients ) +DQMOffline_SecondStepMuonDPGExpress = cms.Sequence( rpcTier0Client * + cscOfflineCollisionsClients* + gemClients ) + + from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM _run3_GEM_DQMOffline_SecondStepMuonDPG = DQMOffline_SecondStepMuonDPG.copy() _run3_GEM_DQMOffline_SecondStepMuonDPG += gemClients @@ -56,10 +61,25 @@ DQMOffline_SecondStepFED * DQMOffline_SecondStepL1T ) + +DQMOffline_SecondStep_PreDPG_Express = cms.Sequence( + DQMOffline_SecondStepEcal * + DQMOffline_SecondStepTrackerStrip * + DQMOffline_SecondStepTrackerPixel * + DQMOffline_SecondStepMuonDPGExpress * + #DQMOffline_SecondStepHcal * + #DQMOffline_SecondStepHcal2 * + DQMOffline_SecondStepFED + #DQMOffline_SecondStepL1T +) + DQMOffline_SecondStepDPG = cms.Sequence( DQMOffline_SecondStep_PreDPG * DQMMessageLoggerClientSeq ) +DQMOffline_SecondStepDPG_Express = cms.Sequence( + DQMOffline_SecondStep_PreDPG_Express * + DQMMessageLoggerClientSeq ) from DQM.TrackingMonitorClient.TrackingClientConfig_Tier0_cff import * from DQMOffline.Muon.muonQualityTests_cff import * @@ -93,11 +113,24 @@ DQMOffline_SecondStepBeam * DQMOffline_SecondStepJetMET ) + +DQMOffline_SecondStep_PrePOG_Express = cms.Sequence( DQMOffline_SecondStepTracking * + DQMOffline_SecondStepMUO * + #DQMOffline_SecondStepEGamma * + DQMOffline_SecondStepTrigger * + DQMOffline_SecondStepBTag * + DQMOffline_SecondStepBeam + #Dqmoffline_SecondStepJetMET +) + + DQMOffline_SecondStepPOG = cms.Sequence( DQMOffline_SecondStep_PrePOG * DQMMessageLoggerClientSeq ) + + HLTMonitoringClient = cms.Sequence(trackingMonitorClientHLT * trackEfficiencyMonitoringClientHLT * trackingForDisplacedJetMonitorClientHLT) HLTMonitoringClientPA= cms.Sequence(trackingMonitorClientHLT * PAtrackingMonitorClientHLT) @@ -108,6 +141,14 @@ DQMMessageLoggerClientSeq * dqmFastTimerServiceClient) +DQMOffline_SecondStep_Express = cms.Sequence( + DQMOffline_SecondStep_PreDPG_Express * + DQMOffline_SecondStep_PrePOG_Express * + HLTMonitoringClient * + DQMMessageLoggerClientSeq * + dqmFastTimerServiceClient) + + DQMOffline_SecondStep_ExtraHLT = cms.Sequence( hltOfflineDQMClientExtra ) DQMOffline_SecondStep_FakeHLT = cms.Sequence( DQMOffline_SecondStep ) diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index 68bdb8aa880d3..898bc80fbd67f 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -67,6 +67,11 @@ rpcTier0Source * cscSources ) + +DQMOfflineMuonDPGExpress = cms.Sequence(rpcTier0Source * + cscSources * + gemSources) + from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM _run3_GEM_DQMOfflineMuonDPG = DQMOfflineMuonDPG.copy() _run3_GEM_DQMOfflineMuonDPG += gemSources @@ -87,9 +92,24 @@ DQMOfflineCASTOR * DQMOfflineCTPPS ) + +DQMOfflinePreDPGExpress = cms.Sequence( DQMOfflineDCS * + #DQMOfflineL1T * + DQMOfflineEcal * + #DQMOfflineHcal * + #DQMOfflineHcal2 * + DQMOfflineTrackerStrip * + DQMOfflineTrackerPixel * + DQMOfflineMuonDPGExpress * + DQMOfflineCASTOR * + DQMOfflineCTPPS ) + DQMOfflineDPG = cms.Sequence( DQMOfflinePreDPG * DQMMessageLogger ) +DQMOfflineDPGExpress = cms.Sequence( DQMOfflinePreDPGExpress * + DQMMessageLogger ) + from DQM.TrackingMonitorSource.TrackingSourceConfig_Tier0_cff import * from DQMOffline.RecoB.PrimaryVertexMonitor_cff import * from DQM.TrackingMonitor.trackingRecoMaterialAnalyzer_cfi import materialDumperAnalyzer @@ -137,9 +157,24 @@ DQMOfflinePhysics ) +DQMOfflinePrePOGExpress = cms.Sequence( DQMOfflineTracking * + DQMOfflineMUO * + #DQMOfflineJetMET * + #DQMOfflineEGamma * + DQMOfflineTrigger * + DQMOfflineBTag * + DQMOfflineBeam + #DQMOfflinePhysics +) + + DQMOfflinePOG = cms.Sequence( DQMOfflinePrePOG * DQMMessageLogger ) +DQMOfflinePOGExpress = cms.Sequence( DQMOfflinePrePOGExpress * + DQMMessageLogger ) + + HLTMonitoring = cms.Sequence( OfflineHLTMonitoring ) HLTMonitoringPA = cms.Sequence( OfflineHLTMonitoringPA ) @@ -149,6 +184,12 @@ HLTMonitoring * DQMMessageLogger ) +DQMOfflineExpress = cms.Sequence( DQMOfflinePreDPGExpress * + DQMOfflinePrePOGExpress * + HLTMonitoring * + DQMMessageLogger ) + + DQMOfflineExtraHLT = cms.Sequence( offlineValidationHLTSource ) diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py index e999936f299c0..3bf98bc3dc8fa 100644 --- a/DQMOffline/Configuration/python/autoDQM.py +++ b/DQMOffline/Configuration/python/autoDQM.py @@ -219,6 +219,10 @@ 'PostDQMOffline', 'dqmHarvesting'], + 'standardDQMExpress': ['DQMOfflineExpress', + 'PostDQMOffline', + 'dqmHarvestingExpress'], + 'standardDQMFS': ['DQMOfflineFS', 'PostDQMOffline', 'dqmHarvesting'],