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

Update GEM offline DQM sequences #31818

Merged
merged 1 commit into from
Oct 16, 2020
Merged

Update GEM offline DQM sequences #31818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from DQM.DTMonitorClient.dtDQMOfflineClients_Cosmics_cff import *
from DQM.RPCMonitorClient.RPCTier0Client_cff import *
from DQM.CSCMonitorModule.csc_dqm_offlineclient_cosmics_cff import *
from DQMOffline.Muon.gem_dqm_offline_client_cff import *
from DQMServices.Components.DQMFEDIntegrityClient_cff import *

DQMNone = cms.Sequence()
Expand All @@ -27,6 +28,12 @@
DQMOfflineCosmics_SecondStepMuonDPG = cms.Sequence( dtClientsCosmics *
rpcTier0Client *
cscOfflineCosmicsClients )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOfflineCosmics_SecondStepMuonDPG = DQMOfflineCosmics_SecondStepMuonDPG.copy()
_run3_GEM_DQMOfflineCosmics_SecondStepMuonDPG += gemClients
run3_GEM.toReplaceWith(DQMOfflineCosmics_SecondStepMuonDPG, _run3_GEM_DQMOfflineCosmics_SecondStepMuonDPG)

DQMOfflineCosmics_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )

DQMOfflineCosmics_SecondStep_PreDPG = cms.Sequence(
Expand Down
7 changes: 7 additions & 0 deletions DQMOffline/Configuration/python/DQMOfflineCosmics_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from DQM.DTMonitorModule.dtDQMOfflineSources_Cosmics_cff import *
from DQM.RPCMonitorClient.RPCTier0Source_cff import *
from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
from DQMOffline.Muon.gem_dqm_offline_source_cff import *
from DQM.EcalPreshowerMonitorModule.es_dqm_source_offline_cosmic_cff import *
from DQM.CastorMonitor.castor_dqm_sourceclient_offline_cff import *

Expand All @@ -33,6 +34,12 @@
rpcTier0Source *
cscSources )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOfflineCosmicsMuonDPG = DQMOfflineCosmicsMuonDPG.copy()
_run3_GEM_DQMOfflineCosmicsMuonDPG += gemSources
run3_GEM.toReplaceWith(DQMOfflineCosmicsMuonDPG, _run3_GEM_DQMOfflineCosmicsMuonDPG)


DQMOfflineCosmicsCASTOR = cms.Sequence( castorSources )

DQMOfflineCosmicsPreDPG = cms.Sequence( DQMOfflineCosmicsDCS *
Expand Down
6 changes: 6 additions & 0 deletions DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from DQM.DTMonitorClient.dtDQMOfflineClients_cff import *
from DQM.RPCMonitorClient.RPCTier0Client_cff import *
from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
from DQMOffline.Muon.gem_dqm_offline_client_cff import *
from DQMServices.Components.DQMFEDIntegrityClient_cff import *

DQMNone = cms.Sequence()
Expand All @@ -28,6 +29,11 @@
rpcTier0Client *
cscOfflineCollisionsClients )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOfflineHeavyIons_SecondStepMuonDPG = DQMOfflineHeavyIons_SecondStepMuonDPG.copy()
_run3_GEM_DQMOfflineHeavyIons_SecondStepMuonDPG += gemClients
run3_GEM.toReplaceWith(DQMOfflineHeavyIons_SecondStepMuonDPG, _run3_GEM_DQMOfflineHeavyIons_SecondStepMuonDPG)

DQMOfflineHeavyIons_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )

DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence(
Expand Down
6 changes: 6 additions & 0 deletions DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from DQM.DTMonitorModule.dtDQMOfflineSources_HI_cff import *
from DQM.RPCMonitorClient.RPCTier0Source_cff import *
from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
from DQMOffline.Muon.gem_dqm_offline_source_cff import *
from DQM.BeamMonitor.AlcaBeamMonitorHeavyIons_cff import *

DQMNone = cms.Sequence()
Expand All @@ -37,6 +38,11 @@
rpcTier0Source *
cscSources )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOfflineHeavyIonsMuonDPG = DQMOfflineHeavyIonsMuonDPG.copy()
_run3_GEM_DQMOfflineHeavyIonsMuonDPG += gemSources
run3_GEM.toReplaceWith(DQMOfflineHeavyIonsMuonDPG, _run3_GEM_DQMOfflineHeavyIonsMuonDPG)

DQMOfflineHeavyIonsPreDPG = cms.Sequence( DQMOfflineHeavyIonsDCS *
DQMOfflineHeavyIonsL1T *
DQMOfflineHeavyIonsEcal *
Expand Down
10 changes: 10 additions & 0 deletions DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from DQM.DTMonitorClient.dtDQMOfflineClients_cff import *
from DQM.RPCMonitorClient.RPCTier0Client_cff import *
from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
from DQMOffline.Muon.gem_dqm_offline_client_cff import *
from DQMOffline.Hcal.HcalDQMOfflinePostProcessor_cff import *
from DQM.HcalTasks.OfflineHarvestingSequence_pp import *
from DQMServices.Components.DQMFEDIntegrityClient_cff import *
Expand All @@ -29,6 +30,11 @@
rpcTier0Client *
cscOfflineCollisionsClients )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOffline_SecondStepMuonDPG = DQMOffline_SecondStepMuonDPG.copy()
_run3_GEM_DQMOffline_SecondStepMuonDPG += gemClients
run3_GEM.toReplaceWith(DQMOffline_SecondStepMuonDPG, _run3_GEM_DQMOffline_SecondStepMuonDPG)

DQMOffline_SecondStepHcal = cms.Sequence( hcalOfflineHarvesting )

DQMOffline_SecondStepHcal2 = cms.Sequence( HcalDQMOfflinePostProcessor )
Expand Down Expand Up @@ -189,6 +195,10 @@
muonQualityTests
)

_run3_GEM_DQMHarvestMuon = DQMHarvestMuon.copy()
_run3_GEM_DQMHarvestMuon += gemClients
run3_GEM.toReplaceWith(DQMHarvestMuon, _run3_GEM_DQMHarvestMuon)

DQMHarvestEcal = cms.Sequence( ecal_dqm_client_offline *
es_dqm_client_offline
)
Expand Down
10 changes: 10 additions & 0 deletions DQMOffline/Configuration/python/DQMOffline_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from DQM.DTMonitorModule.dtDQMOfflineSources_cff import *
from DQM.RPCMonitorClient.RPCTier0Source_cff import *
from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
from DQMOffline.Muon.gem_dqm_offline_source_cff import *
from DQM.CastorMonitor.castor_dqm_sourceclient_offline_cff import *
from DQM.CTPPS.ctppsDQM_cff import *
from DQM.SiTrackerPhase2.Phase2TrackerDQMFirstStep_cff import *
Expand Down Expand Up @@ -60,6 +61,11 @@
rpcTier0Source *
cscSources )

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
_run3_GEM_DQMOfflineMuonDPG = DQMOfflineMuonDPG.copy()
_run3_GEM_DQMOfflineMuonDPG += gemSources
run3_GEM.toReplaceWith(DQMOfflineMuonDPG, _run3_GEM_DQMOfflineMuonDPG)

DQMOfflineCASTOR = cms.Sequence( castorSources )

DQMOfflineCTPPS = cms.Sequence( ctppsDQMOfflineSource )
Expand Down Expand Up @@ -221,6 +227,10 @@
muonMonitors
)

_run3_GEM_DQMOfflineMuon = DQMOfflineMuon.copy()
_run3_GEM_DQMOfflineMuon += gemSources
run3_GEM.toReplaceWith(DQMOfflineMuon, _run3_GEM_DQMOfflineMuon)

#Taus not created in pp conditions for HI
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
_DQMOfflineTAU = cms.Sequence()
Expand Down
6 changes: 4 additions & 2 deletions DQMOffline/Muon/python/gemEfficiencyAnalyzer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@
phase2_GEM.toModify(gemEfficiencyAnalyzerSTA, etaNbins=cms.untracked.int32(15), etaHigh=cms.untracked.double(3.0))


gemEfficiencyAnalyzerSeq = cms.Sequence(
gemEfficiencyAnalyzerTightSeq = cms.Sequence(
cms.ignore(gemOfflineDQMTightGlbMuons) *
gemEfficiencyAnalyzerTight)

gemEfficiencyAnalyzerSTASeq = cms.Sequence(
cms.ignore(gemOfflineDQMStaMuons) *
gemEfficiencyAnalyzerTight *
gemEfficiencyAnalyzerSTA)
7 changes: 1 addition & 6 deletions DQMOffline/Muon/python/gemEfficiencyHarvester_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import FWCore.ParameterSet.Config as cms
from DQMServices.Core.DQMEDHarvester import DQMEDHarvester

from DQMServices.Core.DQMEDHarvester import DQMEDHarvester

gemEfficiencyHarvesterTight = DQMEDHarvester('GEMEfficiencyHarvester',
folder = cms.untracked.string('GEM/GEMEfficiency/TightGlobalMuon'),
logCategory = cms.untracked.string('GEMEfficiencyHarvesterTight')
)


gemEfficiencyHarvesterSTA = DQMEDHarvester('GEMEfficiencyHarvester',
folder = cms.untracked.string('GEM/GEMEfficiency/StandaloneMuon'),
logCategory = cms.untracked.string('GEMEfficiencyHarvesterSTA')
)


gemEfficiencyHarvesterSeq = cms.Sequence(gemEfficiencyHarvesterTight *
gemEfficiencyHarvesterSTA)
7 changes: 7 additions & 0 deletions DQMOffline/Muon/python/gem_dqm_offline_client_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from DQMOffline.Muon.gemEfficiencyHarvester_cfi import *

gemClients = cms.Sequence(
gemEfficiencyHarvesterTight *
gemEfficiencyHarvesterSTA)
9 changes: 9 additions & 0 deletions DQMOffline/Muon/python/gem_dqm_offline_source_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

from DQMOffline.Muon.gemOfflineMonitor_cfi import *
from DQMOffline.Muon.gemEfficiencyAnalyzer_cfi import *

gemSources = cms.Sequence(
gemOfflineMonitor *
gemEfficiencyAnalyzerTightSeq *
gemEfficiencyAnalyzerSTASeq)
9 changes: 0 additions & 9 deletions DQMOffline/Muon/python/muonMonitors_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#dedicated analyzers for offline dqm
from DQMOffline.Muon.muonAnalyzer_cff import *
from DQMOffline.Muon.CSCMonitor_cfi import *
from DQMOffline.Muon.gemOfflineMonitor_cfi import *
from DQMOffline.Muon.gemEfficiencyAnalyzer_cfi import *
from DQMOffline.Muon.muonIdDQM_cff import *
from DQMOffline.Muon.muonIsolationDQM_cff import *

Expand All @@ -37,10 +35,3 @@


muonMonitorsAndQualityTests = cms.Sequence(muonMonitors*muonQualityTests)

_run3_muonMonitors = muonMonitors.copy()
_run3_muonMonitors += gemOfflineMonitor
_run3_muonMonitors += gemEfficiencyAnalyzerSeq

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
run3_GEM.toReplaceWith(muonMonitors, _run3_muonMonitors)
7 changes: 0 additions & 7 deletions DQMOffline/Muon/python/muonQualityTests_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from DQMOffline.Muon.muonTestSummaryCosmics_cfi import *
from DQMOffline.Muon.EfficencyPlotter_cfi import *
from DQMOffline.Muon.TriggerMatchEfficencyPlotter_cfi import *
from DQMOffline.Muon.gemEfficiencyHarvester_cfi import *

from DQMServices.Core.DQMQualityTester import DQMQualityTester
muonSourcesQualityTests = DQMQualityTester(
Expand Down Expand Up @@ -48,9 +47,3 @@
muonClientsQualityTests*
muonTestSummary*
triggerMatchEffPlotterTightMiniAOD)

_run3_muonQualityTests = muonQualityTests.copy()
_run3_muonQualityTests += gemEfficiencyHarvesterSeq

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
run3_GEM.toReplaceWith(muonQualityTests, _run3_muonQualityTests)