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

Fix needed for online DQM to get the fed information and remove two old files not used anymore #5147

Merged
merged 3 commits into from
Sep 23, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#### DQM Environment
#----------------------------
process.load("DQMServices.Core.DQM_cfg")
#process.DQMStore.referenceFileName = "DT_reference.root"


#----------------------------
#### DQM Environment
Expand All @@ -36,6 +34,9 @@
# Global tag
process.load("DQM.Integration.test.FrontierCondition_GT_cfi")

# Need for test in lxplus
#process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi")


#-----------------------------
#### Sub-system configuration follows
Expand All @@ -58,12 +59,8 @@
process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
from EventFilter.EcalRawToDigi.EcalUnpackerData_cfi import ecalEBunpacker
process.ecalDigis = ecalEBunpacker.clone()
import DQM.EcalBarrelMonitorTasks.EBHltTask_cfi
process.ebDQMEvF = DQM.EcalBarrelMonitorTasks.EBHltTask_cfi.ecalBarrelHltTask.clone()
process.ebDQMEvF.folderName = cms.untracked.string('FEDIntegrity_SM')
import DQM.EcalEndcapMonitorTasks.EEHltTask_cfi
process.eeDQMEvF = DQM.EcalEndcapMonitorTasks.EEHltTask_cfi.ecalEndcapHltTask.clone()
process.eeDQMEvF.folderName = cms.untracked.string('FEDIntegrity_SM')
process.load("DQM.EcalMonitorTasks.EcalFEDMonitor_cfi")
process.ecalFEDMonitor.folderName = cms.untracked.string('FEDIntegrity_SM')

# L1T DQM sequences
process.load("DQM.L1TMonitor.L1TFED_cfi")
Expand All @@ -84,6 +81,8 @@
process.SiPixelHLTSource.slowDown = False
process.SiPixelHLTSource.DirName = cms.untracked.string('Pixel/FEDIntegrity_SM/')

process.load("Configuration.StandardSequences.Geometry_cff")

# SiStrip DQM sequences
process.load("DQM.SiStripMonitorHardware.siStripFEDCheck_cfi")
process.siStripFEDCheck.DirName = cms.untracked.string('SiStrip/FEDIntegrity_SM/')
Expand Down Expand Up @@ -119,7 +118,7 @@
process.evfDQMPath = cms.Path(#process.physicsEventsFilter+
process.cscDQMEvF +
process.dtunpacker +
process.ecalDigis + process.ebDQMEvF + process.eeDQMEvF +
process.ecalDigis + process.ecalFEDMonitor +
process.l1tfed +
process.siPixelDigis + process.SiPixelHLTSource +
process.siStripFEDCheck +
Expand All @@ -144,9 +143,8 @@
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
process.SiPixelHLTSource.RawInput = cms.InputTag("rawDataCollector")
process.cscDQMEvF.InputObjects = cms.untracked.InputTag("rawDataCollector")
process.ebDQMEvF.FEDRawDataCollection = cms.InputTag("rawDataCollector")
process.ecalFEDMonitor.FEDRawDataCollection = cms.InputTag("rawDataCollector")
process.ecalPreshowerFEDIntegrityTask.FEDRawDataCollection = cms.InputTag("rawDataCollector")
process.eeDQMEvF.FEDRawDataCollection = cms.InputTag("rawDataCollector")
process.hcalDataIntegrityMonitor.RawDataLabel = cms.untracked.InputTag("rawDataCollector")
process.l1tfed.rawTag = cms.InputTag("rawDataCollector")
process.siStripFEDCheck.RawDataTag = cms.InputTag("rawDataCollector")
Expand Down
45 changes: 0 additions & 45 deletions DQM/Integration/python/test/loop_generic.sh

This file was deleted.

24 changes: 0 additions & 24 deletions DQM/Integration/python/test/loops.sh

This file was deleted.