Skip to content

Commit

Permalink
Merge pull request #13399 from cmsdqm/consumes80x
Browse files Browse the repository at this point in the history 
migrate to consumes, db and geom fixes for online DQM
  • Loading branch information
@davidlange6
davidlange6 committed Mar 1, 2016
2 parents c759cab + 8085636 commit 0485b63
Show file tree
Hide file tree
Showing 20 changed files with 103 additions and 278 deletions.
5 changes: 4 additions & 1 deletion DPGAnalysis/Skims/interface/PhysDecl.h
View file
Expand Up @@ -24,6 +24,8 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "DataFormats/Common/interface/TriggerResults.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"

//
// class declaration
Expand All @@ -42,7 +44,8 @@ class PhysDecl : public edm::EDFilter {
bool debugOn;
bool init_;
std::vector<std::string> hlNames_; // name of each HLT algorithm
edm::InputTag hlTriggerResults_;
edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> gtDigis_;
};

#endif
7 changes: 4 additions & 3 deletions DPGAnalysis/Skims/src/PhysDecl.cc
View file
Expand Up @@ -34,7 +34,8 @@ PhysDecl::PhysDecl(const edm::ParameterSet& iConfig)
{
applyfilter = iConfig.getUntrackedParameter<bool>("applyfilter",true);
debugOn = iConfig.getUntrackedParameter<bool>("debugOn",false);
hlTriggerResults_ = iConfig.getParameter<edm::InputTag> ("HLTriggerResults");
hlTriggerResults_ = consumes<TriggerResults>(iConfig.getParameter<edm::InputTag> ("HLTriggerResults"));
gtDigis_ = consumes<L1GlobalTriggerReadoutRecord>(iConfig.getUntrackedParameter<edm::InputTag> ("gtDigis",edm::InputTag("gtDigis")));
init_ = false;
}

Expand All @@ -55,7 +56,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup)

//hlt info
edm::Handle<TriggerResults> HLTR;
iEvent.getByLabel(hlTriggerResults_,HLTR);
iEvent.getByToken(hlTriggerResults_,HLTR);

if(HLTR.isValid())
{
Expand Down Expand Up @@ -83,7 +84,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup)
// trigger info

edm::Handle<L1GlobalTriggerReadoutRecord> gtrr_handle;
iEvent.getByLabel("gtDigis", gtrr_handle);
iEvent.getByToken(gtDigis_, gtrr_handle);
L1GlobalTriggerReadoutRecord const* gtrr = gtrr_handle.product();

L1GtFdlWord fdlWord = gtrr->gtFdlWord();
Expand Down
2 changes: 1 addition & 1 deletion DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py
View file
Expand Up @@ -25,7 +25,7 @@

# DT digitization and reconstruction
# Switched to TwinMux
from EventFilter.TwinMuxRawToDigi.dttmunpacker_cfi import *
from EventFilter.L1TXRawToDigi.twinMuxStage2Digis_cfi import *
twinMuxStage2Digis.DTTM7_FED_Source = 'rawDataCollector'

from EventFilter.DTRawToDigi.dtunpackerDDUGlobal_cfi import *
Expand Down
133 changes: 29 additions & 104 deletions DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -27,113 +27,38 @@
#============================================
# Castor Conditions: from Global Conditions Tag
#============================================
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load("CondCore.DBCommon.CondDBCommon_cfi")
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
#FIXME: they should use an official GT, not define custom records and conditions on their own!!!
process.GlobalTag.toGet = cms.VPSet( cms.PSet( record = cms.string('CastorGainsRcd'),
tag = cms.string('CastorGains_v2.1_hlt'),
),
cms.PSet( record = cms.string('CastorSaturationCorrsRcd'),
tag = cms.string('CastorSaturationCorrs_v3.00_offline'),
),
cms.PSet( record = cms.string('CastorPedestalWidthsRcd'),
tag = cms.string('CastorPedestalWidths_v3.00_offline'),
),
cms.PSet( record = cms.string('CastorGainWidthsRcd'),
tag = cms.string('CastorGainWidths_v3.00_offline'),
),
cms.PSet( record = cms.string('CastorQIEDataRcd'),
tag = cms.string('CastorQIEData_v3.00_offline'),
),
cms.PSet( record = cms.string('CastorChannelQualityRcd'),
tag = cms.string('CastorChannelQuality_v3.00_offline'),
),
cms.PSet( record = cms.string('CastorElectronicsMapRcd'),
tag = cms.string('CastorElectronicsMap_v3.00_offline'),
),
)

process.CastorDbProducer = cms.ESProducer("CastorDbProducer")

###process.es_pool = cms.ESSource(
### "PoolDBESSource",
### process.CondDBSetup,
### timetype = cms.string('runnumber'),
### connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_31X_HCAL'),
### authenticationMethod = cms.untracked.uint32(0),
### toGet = cms.VPSet(
### cms.PSet(
### record = cms.string('CastorPedestalsRcd'),
### tag = cms.string('castor_pedestals_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorPedestalWidthsRcd'),
### tag = cms.string('castor_pedestalwidths_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorGainsRcd'),
### tag = cms.string('castor_gains_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorGainWidthsRcd'),
### tag = cms.string('castor_gainwidths_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorQIEDataRcd'),
### tag = cms.string('castor_qie_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorChannelQualityRcd'),
### tag = cms.string('castor_channelquality_v1.0')
### ),
### cms.PSet(
### record = cms.string('CastorElectronicsMapRcd'),
### tag = cms.string('castor_emap_dcc_v1.0')
### )
### )
###)

process.es_pool0 = cms.ESSource(
"PoolDBESSource",
process.CondDBSetup,
timetype = cms.string('runnumber'),
###connect = cms.string('frontier://FrontierProd/CMS_COND_31X_HCAL'),
connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_31X_HCAL'),
authenticationMethod = cms.untracked.uint32(0),
toGet = cms.VPSet(
cms.PSet(
record = cms.string('CastorGainsRcd'),
tag = cms.string('CastorGains_v2.1_hlt') #all gains=1, corresponding to GR_P_V43D and CastorGains_v2.1_hlt in frontier://PromptProd/CMS_COND_31X_HCAL
)
)
)

process.es_pool = cms.ESSource(
"PoolDBESSource",
process.CondDBSetup,
timetype = cms.string('runnumber'),
#connect = cms.string('frontier://cmsfrontier.cern.ch:8000/FrontierPrep/CMS_COND_30X_HCAL'),
#connect = cms.string('frontier://cmsfrontier.cern.ch:8000/FrontierProd/CMS_COND_31X_HCAL'),
###connect = cms.string('frontier://FrontierProd/CMS_COND_HCAL_000'),
connect = cms.string('frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOn Prod)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_HCAL_000'),
authenticationMethod = cms.untracked.uint32(0),
toGet = cms.VPSet(
cms.PSet(
record = cms.string('CastorSaturationCorrsRcd'),
tag = cms.string('CastorSaturationCorrs_v3.00_offline')
),
#
cms.PSet(
record = cms.string('CastorPedestalsRcd'),
tag = cms.string('CastorPedestals_v3.00_offline')
),
#
cms.PSet(
record = cms.string('CastorPedestalWidthsRcd'),
tag = cms.string('CastorPedestalWidths_v3.00_offline')
),
#
# cms.PSet(
# record = cms.string('CastorGainsRcd'),
# tag = cms.string('CastorGains_v3.00_offline')
# ),
#
cms.PSet(
record = cms.string('CastorGainWidthsRcd'),
tag = cms.string('CastorGainWidths_v3.00_offline')
),
cms.PSet(
record = cms.string('CastorQIEDataRcd'),
tag = cms.string('CastorQIEData_v3.00_offline')
),
cms.PSet(
record = cms.string('CastorChannelQualityRcd'),
tag = cms.string('CastorChannelQuality_v3.00_offline')
),
cms.PSet(
record = cms.string('CastorElectronicsMapRcd'),
tag = cms.string('CastorElectronicsMap_v3.00_offline')
)
)
)

##most likely the real fix:
#process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
## Condition for lxplus: change and possibly customise the GT
#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')

#-----------------------------
# Castor DQM Source + SimpleReconstrctor
Expand Down
4 changes: 2 additions & 2 deletions DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -48,7 +48,7 @@

#process.dtDQMPathCalib = cms.Path(process.unpackers + process.dqmmodules + process.calibrationEventsFilter * process.dtDQMCalib)

process.dttm7unpacker.DTTM7_FED_Source = cms.InputTag("rawDataCollector")
process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataCollector")
process.dtunpacker.inputLabel = cms.InputTag("rawDataCollector")
process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataCollector")
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
Expand Down Expand Up @@ -77,7 +77,7 @@

if (process.runType.getRunType() == process.runType.hi_run):
process.dtunpacker.fedbyType = cms.bool(False)
process.dttm7unpacker.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
process.dtunpacker.inputLabel = cms.InputTag("rawDataRepacker")
process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
Expand Down
9 changes: 4 additions & 5 deletions DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -5,9 +5,10 @@

### Load cfis ###

process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
#process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
#process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
#process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.EcalMapping.EcalMapping_cfi")
process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
Expand Down Expand Up @@ -125,12 +126,10 @@
process.GlobalTag.toGet = cms.VPSet(cms.PSet(
record = cms.string('EcalDQMChannelStatusRcd'),
tag = cms.string('EcalDQMChannelStatus_v1_hlt'),
connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
),
cms.PSet(
record = cms.string('EcalDQMTowerStatusRcd'),
tag = cms.string('EcalDQMTowerStatus_v1_hlt'),
connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
))

process.preScaler.prescaleFactor = 1
Expand Down
9 changes: 4 additions & 5 deletions DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -5,9 +5,10 @@

### Load cfis ###

process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
#process.load("Geometry.CaloEventSetup.CaloGeometry_cfi")
#process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
#process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.EcalMapping.EcalMapping_cfi")
process.load("Geometry.EcalMapping.EcalMappingRecord_cfi")
Expand Down Expand Up @@ -170,12 +171,10 @@
process.GlobalTag.toGet = cms.VPSet(cms.PSet(
record = cms.string('EcalDQMChannelStatusRcd'),
tag = cms.string('EcalDQMChannelStatus_v1_hlt'),
connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
),
cms.PSet(
record = cms.string('EcalDQMTowerStatusRcd'),
tag = cms.string('EcalDQMTowerStatus_v1_hlt'),
connect = cms.string('frontier://(proxyurl=http://frontier.cms:3128)(serverurl=http://frontier.cms:8000/FrontierOnProd)(serverurl=http://frontier.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_COND_34X_ECAL')
))

process.ecalTestPulseMonitorTask.verbosity = 0
Expand Down
26 changes: 6 additions & 20 deletions DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -50,12 +50,12 @@
#-------------------------------------
# CMSSW/Hcal non-DQM Related Module import
#-------------------------------------
process.load('Configuration.Geometry.GeometryIdeal_cff')
process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
#process.load('Configuration.Geometry.GeometryIdeal_cff')
process.load('FWCore.MessageLogger.MessageLogger_cfi')
process.load("EventFilter.HcalRawToDigi.HcalRawToDigi_cfi")
process.load("RecoLocalCalo.Configuration.hcalLocalReco_cff")
process.load("SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load("L1Trigger.Configuration.L1DummyConfig_cff")
process.load("EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi")

Expand Down Expand Up @@ -114,24 +114,10 @@
# Will not be here for Online DQM
#-------------------------------------
if useMap:
process.es_pool = cms.ESSource("PoolDBESSource",
process.CondDBSetup,
timetype = cms.string('runnumber'),
toGet = cms.VPSet(
cms.PSet(
record = cms.string(
"HcalElectronicsMapRcd"
),
tag = cms.string(
"HcalElectronicsMap_v7.05_hlt"
)
)
),
connect = cms.string(
'frontier://FrontierProd/CMS_CONDITIONS'),
authenticationMethod = cms.untracked.uint32(0)
)
process.es_prefer_es_pool = cms.ESPrefer('PoolDBESSource', 'es_pool')
process.GlobalTag.toGet.append(cms.PSet(record = cms.string("HcalElectronicsMapRcd"),
tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
)
)

#-------------------------------------
# For Debugginb
Expand Down
23 changes: 4 additions & 19 deletions DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
View file
Expand Up @@ -55,7 +55,6 @@
process.load("EventFilter.HcalRawToDigi.HcalRawToDigi_cfi")
process.load("RecoLocalCalo.Configuration.hcalLocalReco_cff")
process.load("SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load("L1Trigger.Configuration.L1DummyConfig_cff")
process.load("EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi")

Expand Down Expand Up @@ -108,24 +107,10 @@
# Absent for Online Running
#-------------------------------------
if useMap:
process.es_pool = cms.ESSource("PoolDBESSource",
process.CondDBSetup,
timetype = cms.string('runnumber'),
toGet = cms.VPSet(
cms.PSet(
record = cms.string(
"HcalElectronicsMapRcd"
),
tag = cms.string(
"HcalElectronicsMap_v7.05_hlt"
)
)
),
connect = cms.string(
'frontier://FrontierProd/CMS_CONDITIONS'),
authenticationMethod = cms.untracked.uint32(0)
)
process.es_prefer_es_pool = cms.ESPrefer('PoolDBESSource', 'es_pool')
process.GlobalTag.toGet.append(cms.PSet(record = cms.string("HcalElectronicsMapRcd"),
tag = cms.string("HcalElectronicsMap_v7.05_hlt"),
)
)

#-------------------------------------
# For Debugginb
Expand Down

0 comments on commit 0485b63

Please sign in to comment.