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.

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

New folder in rpcdqm online to test new readouts #24902

Merged
merged 6 commits into from
Oct 25, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not have been removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is fixed.

process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker")
process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker")
Expand All @@ -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
Expand Down
60 changes: 51 additions & 9 deletions DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
# 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.GlobalTag.RefreshEachRun = cms.untracked.bool(True)
Expand All @@ -48,20 +49,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")
Expand All @@ -73,7 +101,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")

Expand All @@ -87,6 +117,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",
Expand All @@ -101,11 +134,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")
Expand All @@ -120,7 +162,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 *
Expand Down