Skip to content

Commit

Permalink
Remove DQMDcsInfo.
Browse files Browse the repository at this point in the history 
DQMProvInfo provides roughly the same functionality (and more), is much
simpler and actually works, and is used in online since a long time.

This PR replaces DQMDcsInfo with DQMProvInfo also in offline.
  • Loading branch information
@schneiml
schneiml committed Jan 30, 2020
1 parent 6b2b81c commit 85a7032
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 472 deletions.
5 changes: 1 addition & 4 deletions DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py
View file
@@ -1,7 +1,6 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLoggerClient_cff import *
from DQMServices.Components.DQMDcsInfoClient_cfi import *
from DQMServices.Components.DQMFastTimerServiceClient_cfi import *

from DQMOffline.Ecal.ecal_dqm_client_offline_cosmic_cff import *
Expand All @@ -14,8 +13,6 @@
from DQM.CSCMonitorModule.csc_dqm_offlineclient_cosmics_cff import *
from DQMServices.Components.DQMFEDIntegrityClient_cff import *

DQMOfflineCosmics_SecondStepDCS = cms.Sequence( dqmDcsInfoClient )

DQMOfflineCosmics_SecondStepEcal = cms.Sequence( ecal_dqm_client_offline *
es_dqm_client_offline )

Expand All @@ -30,7 +27,7 @@
cscOfflineCosmicsClients )
DQMOfflineCosmics_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )

DQMOfflineCosmics_SecondStep_PreDPG = cms.Sequence( DQMOfflineCosmics_SecondStepDCS *
DQMOfflineCosmics_SecondStep_PreDPG = cms.Sequence(
DQMOfflineCosmics_SecondStepEcal *
DQMOfflineCosmics_SecondStepHcal *
DQMOfflineCosmics_SecondStepTrackerStrip *
Expand Down
5 changes: 3 additions & 2 deletions DQMOffline/Configuration/python/DQMOfflineCosmics_cff.py
View file
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLogger_cfi import *
from DQMServices.Components.DQMDcsInfo_cfi import *
from DQMServices.Components.DQMProvInfo_cfi import *
from DQMServices.Components.DQMFastTimerService_cff import *

from DQMOffline.Ecal.ecal_dqm_source_offline_cosmic_cff import *
Expand All @@ -14,7 +14,8 @@
from DQM.EcalPreshowerMonitorModule.es_dqm_source_offline_cosmic_cff import *
from DQM.CastorMonitor.castor_dqm_sourceclient_offline_cff import *

DQMOfflineCosmicsDCS = cms.Sequence( dqmDcsInfo )
dqmProvInfo.runType = "cosmics_run"
DQMOfflineCosmicsDCS = cms.Sequence( dqmProvInfo )

DQMOfflineCosmicsEcal = cms.Sequence( ecal_dqm_source_offline *
es_dqm_source_offline )
Expand Down
5 changes: 1 addition & 4 deletions DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py
View file
@@ -1,7 +1,6 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLoggerClient_cff import *
from DQMServices.Components.DQMDcsInfoClient_cfi import *
from DQMServices.Components.DQMFastTimerServiceClient_cfi import *

from DQMOffline.Ecal.ecal_dqm_client_offline_cff import *
Expand All @@ -14,8 +13,6 @@
from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
from DQMServices.Components.DQMFEDIntegrityClient_cff import *

DQMOfflineHeavyIons_SecondStepDCS = cms.Sequence( dqmDcsInfoClient )

DQMOfflineHeavyIons_SecondStepEcal = cms.Sequence( ecal_dqm_client_offline *
es_dqm_client_offline )

Expand All @@ -31,7 +28,7 @@

DQMOfflineHeavyIons_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )

DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence( DQMOfflineHeavyIons_SecondStepDCS *
DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence(
DQMOfflineHeavyIons_SecondStepEcal *
DQMOfflineHeavyIons_SecondStepTrackerStrip *
DQMOfflineHeavyIons_SecondStepTrackerPixel *
Expand Down
5 changes: 3 additions & 2 deletions DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
View file
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLogger_cfi import *
from DQMServices.Components.DQMDcsInfo_cfi import *
from DQMServices.Components.DQMProvInfo_cfi import *
from DQMServices.Components.DQMFastTimerService_cff import *

from DQMOffline.L1Trigger.L1TriggerDqmOffline_cff import *
Expand All @@ -15,7 +15,8 @@
from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
from DQM.BeamMonitor.AlcaBeamMonitorHeavyIons_cff import *

DQMOfflineHeavyIonsDCS = cms.Sequence( dqmDcsInfo )
dqmProvInfo.runType = "hi_run"
DQMOfflineHeavyIonsDCS = cms.Sequence( dqmProvInfo )

# L1 trigger sequences
DQMOfflineHeavyIonsL1T = cms.Sequence( l1TriggerDqmOffline ) # L1 emulator is run within this sequence for real data
Expand Down
10 changes: 1 addition & 9 deletions DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
View file
@@ -1,7 +1,6 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLoggerClient_cff import *
from DQMServices.Components.DQMDcsInfoClient_cfi import *
from DQMServices.Components.DQMFastTimerServiceClient_cfi import *

from DQMOffline.Ecal.ecal_dqm_client_offline_cff import *
Expand All @@ -17,8 +16,6 @@
from DQMOffline.L1Trigger.L1TriggerDqmOffline_cff import *
from DQM.SiTrackerPhase2.Phase2TrackerDQMHarvesting_cff import *

DQMOffline_SecondStepDCS = cms.Sequence( dqmDcsInfoClient )

DQMOffline_SecondStepEcal = cms.Sequence( ecal_dqm_client_offline *
es_dqm_client_offline )

Expand All @@ -38,7 +35,7 @@

DQMOffline_SecondStepL1T = cms.Sequence( l1TriggerDqmOfflineClient )

DQMOffline_SecondStep_PreDPG = cms.Sequence( DQMOffline_SecondStepDCS *
DQMOffline_SecondStep_PreDPG = cms.Sequence(
DQMOffline_SecondStepEcal *
DQMOffline_SecondStepTrackerStrip *
DQMOffline_SecondStepTrackerPixel *
Expand Down Expand Up @@ -118,8 +115,6 @@
from Validation.RecoTau.DQMSequences_cfi import *
from DQM.TrackingMonitorClient.pixelTrackingEffFromHitPattern_cff import *

DQMHarvestDCS = cms.Sequence ( dqmDcsInfoClient )

DQMHarvestTrackerStrip = cms.Sequence ( SiStripOfflineDQMClient )

DQMHarvestTrackerPixel = cms.Sequence ( PixelOfflineDQMClientNoDataCertification )
Expand All @@ -142,7 +137,6 @@
DQMHarvestL1TMuon = cms.Sequence( l1TriggerMuonDqmOfflineClient )

DQMHarvestCommon = cms.Sequence( DQMMessageLoggerClientSeq *
DQMHarvestDCS *
DQMHarvestTrackerStrip *
DQMHarvestTrack *
DQMHarvestTrackerPixel *
Expand All @@ -158,7 +152,6 @@

DQMHarvestCommonSiStripZeroBias = cms.Sequence(
DQMMessageLoggerClientSeq *
DQMHarvestDCS *
DQMHarvestTrackerStrip *
DQMHarvestTrack *
DQMHarvestTrackerPixel *
Expand All @@ -178,7 +171,6 @@
DQMHarvestPixelTracking = cms.Sequence( pixelTrackingEffFromHitPattern )

DQMHarvestOuterTracker = cms.Sequence(
dqmDcsInfoClient *
OuterTrackerClient *
dqmFEDIntegrityClient *
DQMMessageLoggerClientSeq *
Expand Down
5 changes: 3 additions & 2 deletions DQMOffline/Configuration/python/DQMOffline_cff.py
View file
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLogger_cfi import *
from DQMServices.Components.DQMDcsInfo_cfi import *
from DQMServices.Components.DQMProvInfo_cfi import *
from DQMServices.Components.DQMFastTimerService_cff import *

from DQMOffline.L1Trigger.L1TriggerDqmOffline_cff import *
Expand All @@ -22,7 +22,8 @@

DQMMessageLoggerSeq = cms.Sequence( DQMMessageLogger )

DQMOfflineDCS = cms.Sequence( dqmDcsInfo )
dqmProvInfo.runType = "pp_run"
DQMOfflineDCS = cms.Sequence( dqmProvInfo )

# L1 trigger sequences
DQMOfflineL1T = cms.Sequence( l1TriggerDqmOffline ) # L1 emulator is run within this sequence for real data
Expand Down
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/test/runDQMOffline_step1NoRECO_L1TriggerOnly_job1_cfg.py
View file
Expand Up @@ -21,7 +21,6 @@
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')

# Removing other DQM modules form the DQMOfflinePreDPG
process.DQMOfflinePreDPG.remove(process.dqmDcsInfo)
process.DQMOfflinePreDPG.remove(process.ecal_dqm_source_offline)
process.DQMOfflinePreDPG.remove(process.hcalOfflineDQMSource)
process.DQMOfflinePreDPG.remove(process.SiStripDQMTier0)
Expand Down Expand Up @@ -105,4 +104,4 @@
#call to customisation function customise imported from DQMTools.Tests.customDQM
process = customise(process)

# End of customisation functions
# End of customisation functions
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/test/runDQMOffline_step1_L1TriggerOnly_job1_cfg.py
View file
Expand Up @@ -21,7 +21,6 @@
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')

# Removing other DQM modules form the DQMOfflinePreDPG
process.DQMOfflinePreDPG.remove(process.dqmDcsInfo)
process.DQMOfflinePreDPG.remove(process.ecal_dqm_source_offline)
process.DQMOfflinePreDPG.remove(process.hcalOfflineDQMSource)
process.DQMOfflinePreDPG.remove(process.SiStripDQMTier0)
Expand Down Expand Up @@ -104,4 +103,4 @@
#call to customisation function customise imported from DQMTools.Tests.customDQM
process = customise(process)

# End of customisation functions
# End of customisation functions
1 change: 0 additions & 1 deletion DQMOffline/L1Trigger/test/runDQMOffline_step2_L1TriggerOnly_cfg.py
View file
Expand Up @@ -19,7 +19,6 @@
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')

# Removing other DQM modules form the DQMOffline_SecondStep_PreDPG
process.DQMOffline_SecondStep_PreDPG.remove(process.dqmDcsInfoClient)
process.DQMOffline_SecondStep_PreDPG.remove(process.ecal_dqm_client_offline)
process.DQMOffline_SecondStep_PreDPG.remove(process.hcalOfflineDQMClient)
process.DQMOffline_SecondStep_PreDPG.remove(process.SiStripOfflineDQMClient)
Expand Down
7 changes: 3 additions & 4 deletions DQMOffline/Muon/test/DQMOffline_SecondStep_cff.py
View file
Expand Up @@ -5,7 +5,6 @@

from CondTools.DQM.DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi import *
from DQMServices.Components.DQMMessageLoggerClient_cff import *
from DQMServices.Components.DQMDcsInfoClient_cfi import *

from DQMOffline.Ecal.ecal_dqm_client_offline_cff import *
from DQM.HcalMonitorModule.hcal_dqm_client_fileT0_cff import *
Expand All @@ -19,7 +18,7 @@
from DQMServices.Components.DQMFEDIntegrityClient_cff import *


DQMOffline_SecondStep_PreDPG = cms.Sequence( dqmDcsInfoClient *
DQMOffline_SecondStep_PreDPG = cms.Sequence(
#ecal_dqm_client_offline *
#hcalOfflineDQMClient *
SiStripOfflineDQMClient *
Expand Down Expand Up @@ -71,7 +70,7 @@
DQMMessageLoggerClientSeq )


#DQMHarvestCommon = cms.Sequence(dqmDcsInfoClient *
#DQMHarvestCommon = cms.Sequence(
# SiStripOfflineDQMClient *
# PixelOfflineDQMClientNoDataCertification *
# l1TriggerDqmOfflineClient *
Expand All @@ -82,7 +81,7 @@
# SusyPostProcessorSequence
# )

DQMHarvestCommon = cms.Sequence(dqmDcsInfoClient *
DQMHarvestCommon = cms.Sequence(
SiStripOfflineDQMClient *
PixelOfflineDQMClientNoDataCertification *
# l1TriggerDqmOfflineClient *
Expand Down
5 changes: 2 additions & 3 deletions DQMOffline/Muon/test/DQMOffline_cff.py
View file
Expand Up @@ -4,7 +4,6 @@
import FWCore.ParameterSet.Config as cms

from DQMServices.Components.DQMMessageLogger_cfi import *
from DQMServices.Components.DQMDcsInfo_cfi import *

from DQMOffline.Ecal.ecal_dqm_source_offline_cff import *
from DQM.HcalMonitorModule.hcal_dqm_source_fileT0_cff import *
Expand All @@ -17,7 +16,7 @@
from DQM.BeamMonitor.AlcaBeamMonitor_cff import *
from DQM.CastorMonitor.castor_dqm_sourceclient_offline_cff import *

DQMOfflinePreDPG = cms.Sequence( dqmDcsInfo *
DQMOfflinePreDPG = cms.Sequence(
#ecal_dqm_source_offline *
#hcalOfflineDQMSource *
SiStripDQMTier0 *
Expand Down Expand Up @@ -71,7 +70,7 @@
DQMOfflinePhysics = cms.Sequence( dqmPhysics )


DQMOfflineCommon = cms.Sequence( dqmDcsInfo *
DQMOfflineCommon = cms.Sequence(
DQMMessageLogger *
SiStripDQMTier0 *
siPixelOfflineDQM_source
Expand Down

0 comments on commit 85a7032

Please sign in to comment.