From d1d95211c8accf8a8083cc0f96779d250672fc90 Mon Sep 17 00:00:00 2001 From: samet lezki Date: Wed, 17 Oct 2018 11:29:26 +0200 Subject: [PATCH 1/6] Adding new folder to test new readouts for RPC DQM online --- .../clients/rpc_dqm_sourceclient-live_cfg.py | 62 ++++++++++++++++--- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py index c5f6795262672..5c10d61f218ab 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -30,8 +30,11 @@ # Condition for P5 cluster process.load("DQM.Integration.config.FrontierCondition_GT_cfi") # Condition for lxplus: change and possibly customise the GT +#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '') +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +#process.GlobalTag.globaltag = "102X_dataRun2_Express_v4" process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) ############# DQM Cetral Modules ################ @@ -48,20 +51,47 @@ process.load("EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi") ############## RPC Unpacker #################### +process.load("EventFilter.RPCRawToDigi.rpcUnpackingModule_cfi") process.rpcunpacker = cms.EDProducer("RPCUnpackingModule", InputLabel = cms.InputTag("source"), doSynchro = cms.bool(False) ) +### RPC RawToDigi - from TwinMux +process.load("EventFilter.RPCRawToDigi.RPCTwinMuxRawToDigi_cff") + +### RPC RawToDigi - from CPPF +process.load("EventFilter.RPCRawToDigi.RPCCPPFRawToDigi_cff") +# process.load("EventFilter.RPCRawToDigi.RPCCPPFRawToDigi_sqlite_cff") #to load CPPF link maps from the local DB + +### RPC RawToDigi - from OMTF +process.load('Configuration.StandardSequences.RawToDigi_Data_cff') +process.omtfStage2Digis = cms.EDProducer("OmtfUnpacker", + inputLabel = cms.InputTag('rawDataCollector'), +) + +process.load("EventFilter.RPCRawToDigi.RPCDigiMerger_cff") + ################# RPC Rec Hits ################# process.load("RecoLocalMuon.RPCRecHit.rpcRecHits_cfi") process.rpcRecHits.rpcDigiLabel = 'rpcunpacker' - +####################################################### +### RPCRecHit - from Merger +process.rpcMergerRecHits = process.rpcRecHits.clone() +process.rpcMergerRecHits.rpcDigiLabel = cms.InputTag('rpcDigiMerger') ################ DQM Digi Module ################ +### DQM - from legacy process.load("DQM.RPCMonitorDigi.RPCDigiMonitoring_cfi") -process.rpcdigidqm.UseMuon = cms.untracked.bool(useMuons) -process.rpcdigidqm.NoiseFolder = cms.untracked.string("AllHits") +process.rpcdigidqm.UseMuon = useMuons +process.rpcdigidqm.NoiseFolder = cms.untracked.string("AllHits") +process.rpcdigidqm.RecHitLabel = cms.InputTag("rpcRecHits") +### DQM - from Merger +process.rpcMergerdigidqm = process.rpcdigidqm.clone() +process.rpcMergerdigidqm.NoiseFolder = cms.untracked.string("AllHitsMerger") +process.rpcMergerdigidqm.RecHitLabel = cms.InputTag("rpcMergerRecHits") + +####################################################### ################# DCS Info ###################### process.load("DQM.RPCMonitorDigi.RPCDcsInfo_cfi") @@ -73,7 +103,9 @@ process.rpcdqmclient.MinimumRPCEvents = cms.untracked.int32(100) process.rpcdqmclient.OfflineDQM = cms.untracked.bool(isOfflineDQM) process.rpcdqmclient.RecHitTypeFolder = cms.untracked.string("AllHits") - +### Merger +process.rpcMergerdqmclient = process.rpcdqmclient.clone() +process.rpcMergerdqmclient.RecHitTypeFolder = cms.untracked.string("AllHitsMerger") ################# Other Clients ################# #process.load("DQM.RPCMonitorClient.RPCMon_SS_Dbx_Global_cfi") @@ -87,6 +119,9 @@ process.rpcEventSummary.OfflineDQM = cms.untracked.bool(isOfflineDQM ) process.rpcEventSummary.MinimumRPCEvents = cms.untracked.int32(10000) process.rpcEventSummary.RecHitTypeFolder = cms.untracked.string("AllHits") +### Merger +process.rpcEventSummaryMerger = process.rpcEventSummary.clone() +process.rpcEventSummaryMerger.RecHitTypeFolder = cms.untracked.string("AllHitsMerger") ################# Quality Tests ################# process.qTesterRPC = cms.EDAnalyzer("QualityTester", @@ -101,11 +136,20 @@ process.rpcChamberQuality.OfflineDQM = cms.untracked.bool(isOfflineDQM ) process.rpcChamberQuality.RecHitTypeFolder = cms.untracked.string("AllHits") process.rpcChamberQuality.MinimumRPCEvents = cms.untracked.int32(10000) - +### Merger +process.rpcChamberQualityMerger = process.rpcChamberQuality.clone() +process.rpcChamberQualityMerger.RecHitTypeFolder = cms.untracked.string("AllHitsMerger") + ############### Sequences ###################### -process.rpcSource = cms.Sequence(process.rpcunpacker*process.rpcRecHits*process.scalersRawToDigi*process.rpcdigidqm*process.rpcMonitorRaw*process.rpcDcsInfo*process.qTesterRPC) -process.rpcClient = cms.Sequence(process.rpcdqmclient*process.rpcChamberQuality*process.rpcEventSummary*process.dqmEnv*process.dqmSaver) -#process.p = cms.Path(process.rpcSource*process.rpcClient) +process.rpcSource = cms.Sequence( process.rpcunpacker + * (process.rpcUnpackingModule + process.rpcTwinMuxRawToDigi + process.rpcCPPFRawToDigi + process.omtfStage2Digis) + * process.rpcDigiMerger + * (process.rpcRecHits + process.rpcMergerRecHits) + * process.scalersRawToDigi + * (process.rpcdigidqm + process.rpcMergerdigidqm) + * process.rpcMonitorRaw*process.rpcDcsInfo*process.qTesterRPC + ) +process.rpcClient = cms.Sequence(process.rpcdqmclient*process.rpcMergerdqmclient*process.rpcChamberQuality*process.rpcChamberQualityMerger*process.rpcEventSummary*process.rpcEventSummaryMerger*process.dqmEnv*process.dqmSaver) process.p = cms.Path(process.hltTriggerTypeFilter*process.rpcSource*process.rpcClient) process.rpcunpacker.InputLabel = cms.InputTag("rawDataCollector") @@ -120,7 +164,7 @@ process.rpcunpacker.InputLabel = cms.InputTag("rawDataRepacker") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") process.rpcEventSummary.MinimumRPCEvents = cms.untracked.int32(100000) - + process.rpcEventSummaryMerger.MinimumRPCEvents = cms.untracked.int32(100000) ### process customizations included here from DQM.Integration.config.online_customizations_cfi import * From 9b1feba58a63f00130bb6293f6e08d5a1a8f987a Mon Sep 17 00:00:00 2001 From: samet lezki Date: Wed, 17 Oct 2018 11:37:31 +0200 Subject: [PATCH 2/6] cleaning --- DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py index 5c10d61f218ab..ac039fb37da53 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -33,8 +33,6 @@ #process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '') -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -#process.GlobalTag.globaltag = "102X_dataRun2_Express_v4" process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) ############# DQM Cetral Modules ################ From ad28afa1a97ad666291acc90e382c939dd909c72 Mon Sep 17 00:00:00 2001 From: samet lezki Date: Mon, 22 Oct 2018 16:05:20 +0200 Subject: [PATCH 3/6] changing name 'RPCTwinMuxRawToDigi' to 'rpcTwinMuxRawToDigi' and adding 'rpcCPPFRawToDigi' for the HCAL and L1T --- .../python/clients/hcal_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/l1tstage2_dqm_sourceclient-live_cfg.py | 3 ++- .../clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py index cae25daf74669..db46cc14a29e6 100644 --- a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py @@ -110,7 +110,6 @@ if isHeavyIon: process.csctfDigis.producer = cms.InputTag("rawDataRepacker") process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker") - process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.caloStage1Digis.InputLabel = cms.InputTag("rawDataRepacker") #new @@ -120,6 +119,8 @@ process.caloStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") + process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") + process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker") # Exclude the laser FEDs. They contaminate the QIE10/11 digi collections. #from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py index bb57bd794d842..a6362a54ffc17 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -139,7 +139,6 @@ process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") - process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker") process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") @@ -154,6 +153,8 @@ process.l1tStage2BmtfZeroSupp.rawData = cms.InputTag("rawDataRepacker") process.l1tStage2BmtfZeroSuppFatEvts.rawData = cms.InputTag("rawDataRepacker") process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker") + process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") + process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker") #-------------------------------------------------- # L1T Online DQM Schedule diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index 7c0abd208c609..422b251b9fcee 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -135,9 +135,7 @@ process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") - process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker") - process.valBmtfAlgoSel.feds = cms.InputTag("rawDataRepacker") process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") @@ -148,6 +146,8 @@ process.l1tdeStage2CaloLayer1.fedRawDataLabel = cms.InputTag("rawDataRepacker") process.gtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker") + process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") + process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker") #-------------------------------------------------- # L1T Emulator Online DQM Schedule From 51070a6cf6b64b53aee0186b4a3f88e525659d41 Mon Sep 17 00:00:00 2001 From: samet lezki Date: Tue, 23 Oct 2018 11:49:54 +0200 Subject: [PATCH 4/6] fixed wrong deleting --- .../clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index 422b251b9fcee..16a331a4bf81e 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -136,6 +136,7 @@ process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.valBmtfAlgoSel.feds = cms.InputTag("rawDataRepacker") process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") From 168b2dc025769c42ff905491b3ed4798b3a2a85d Mon Sep 17 00:00:00 2001 From: samet lezki Date: Tue, 23 Oct 2018 16:27:32 +0200 Subject: [PATCH 5/6] Fixing Bug and adding missing collections for HI Run --- .../python/clients/rpc_dqm_sourceclient-live_cfg.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py index ac039fb37da53..2e77207429702 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -33,6 +33,7 @@ #process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '') +#process.GlobalTag.globaltag = "102X_dataRun2_Express_v4" process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) ############# DQM Cetral Modules ################ @@ -49,7 +50,6 @@ process.load("EventFilter.ScalersRawToDigi.ScalersRawToDigi_cfi") ############## RPC Unpacker #################### -process.load("EventFilter.RPCRawToDigi.rpcUnpackingModule_cfi") process.rpcunpacker = cms.EDProducer("RPCUnpackingModule", InputLabel = cms.InputTag("source"), doSynchro = cms.bool(False) @@ -63,7 +63,6 @@ # process.load("EventFilter.RPCRawToDigi.RPCCPPFRawToDigi_sqlite_cff") #to load CPPF link maps from the local DB ### RPC RawToDigi - from OMTF -process.load('Configuration.StandardSequences.RawToDigi_Data_cff') process.omtfStage2Digis = cms.EDProducer("OmtfUnpacker", inputLabel = cms.InputTag('rawDataCollector'), ) @@ -140,7 +139,7 @@ ############### Sequences ###################### process.rpcSource = cms.Sequence( process.rpcunpacker - * (process.rpcUnpackingModule + process.rpcTwinMuxRawToDigi + process.rpcCPPFRawToDigi + process.omtfStage2Digis) + * (process.rpcTwinMuxRawToDigi + process.rpcCPPFRawToDigi + process.omtfStage2Digis) * process.rpcDigiMerger * (process.rpcRecHits + process.rpcMergerRecHits) * process.scalersRawToDigi @@ -152,6 +151,7 @@ process.rpcunpacker.InputLabel = cms.InputTag("rawDataCollector") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector") +process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataCollector") #-------------------------------------------------- # Heavy Ion Specific Fed Raw Data Collection Label #-------------------------------------------------- @@ -161,6 +161,8 @@ if (process.runType.getRunType() == process.runType.hi_run): process.rpcunpacker.InputLabel = cms.InputTag("rawDataRepacker") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") + process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker") + process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.rpcEventSummary.MinimumRPCEvents = cms.untracked.int32(100000) process.rpcEventSummaryMerger.MinimumRPCEvents = cms.untracked.int32(100000) From e25d2fd27e919a3f9eb48cc097829f3160cadc7b Mon Sep 17 00:00:00 2001 From: samet lezki Date: Tue, 23 Oct 2018 18:35:55 +0200 Subject: [PATCH 6/6] adding rpcTwinMuxRawToDigi for HI Run --- DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py index 2e77207429702..6998c73a5328b 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -161,6 +161,7 @@ if (process.runType.getRunType() == process.runType.hi_run): process.rpcunpacker.InputLabel = cms.InputTag("rawDataRepacker") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") + process.rpcTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.rpcCPPFRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.rpcEventSummary.MinimumRPCEvents = cms.untracked.int32(100000)