diff --git a/DPGAnalysis/Skims/interface/PhysDecl.h b/DPGAnalysis/Skims/interface/PhysDecl.h index c49bad7bffe8e..2597f4588ad09 100644 --- a/DPGAnalysis/Skims/interface/PhysDecl.h +++ b/DPGAnalysis/Skims/interface/PhysDecl.h @@ -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 @@ -42,7 +44,8 @@ class PhysDecl : public edm::EDFilter { bool debugOn; bool init_; std::vector hlNames_; // name of each HLT algorithm - edm::InputTag hlTriggerResults_; + edm::EDGetTokenT hlTriggerResults_; + edm::EDGetTokenT gtDigis_; }; #endif diff --git a/DPGAnalysis/Skims/src/PhysDecl.cc b/DPGAnalysis/Skims/src/PhysDecl.cc index de0c5621f4a5f..c7a7ee6a4b050 100644 --- a/DPGAnalysis/Skims/src/PhysDecl.cc +++ b/DPGAnalysis/Skims/src/PhysDecl.cc @@ -34,7 +34,8 @@ PhysDecl::PhysDecl(const edm::ParameterSet& iConfig) { applyfilter = iConfig.getUntrackedParameter("applyfilter",true); debugOn = iConfig.getUntrackedParameter("debugOn",false); - hlTriggerResults_ = iConfig.getParameter ("HLTriggerResults"); + hlTriggerResults_ = consumes(iConfig.getParameter ("HLTriggerResults")); + gtDigis_ = consumes(iConfig.getUntrackedParameter ("gtDigis",edm::InputTag("gtDigis"))); init_ = false; } @@ -55,7 +56,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup) //hlt info edm::Handle HLTR; - iEvent.getByLabel(hlTriggerResults_,HLTR); + iEvent.getByToken(hlTriggerResults_,HLTR); if(HLTR.isValid()) { @@ -83,7 +84,7 @@ bool PhysDecl::filter( edm::Event& iEvent, const edm::EventSetup& iSetup) // trigger info edm::Handle gtrr_handle; - iEvent.getByLabel("gtDigis", gtrr_handle); + iEvent.getByToken(gtDigis_, gtrr_handle); L1GlobalTriggerReadoutRecord const* gtrr = gtrr_handle.product(); L1GtFdlWord fdlWord = gtrr->gtFdlWord(); diff --git a/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py b/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py index 269186abd0870..1d38d7e94adab 100644 --- a/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py +++ b/DQM/DTMonitorModule/python/dt_dqm_sourceclient_common_cff.py @@ -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 * diff --git a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py index d3c3084272b8b..afd5cc65f0d37 100644 --- a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py @@ -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 diff --git a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py index c8b89e414f2b6..997a36cc8a5b7 100644 --- a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py @@ -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") @@ -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") diff --git a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py index 916119748ac50..1f35765a47122 100644 --- a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py @@ -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") @@ -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 diff --git a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py index 583189790a0ae..fe9e0ae717fb0 100644 --- a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py @@ -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") @@ -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 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 9ba3563c32f1c..1e97466bca2de 100644 --- a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py @@ -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") @@ -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 diff --git a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py index c15942b6c4ef4..823a64b8e304f 100644 --- a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py @@ -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") @@ -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 diff --git a/DQM/Integration/python/clients/hcaltiming_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcaltiming_dqm_sourceclient-live_cfg.py deleted file mode 100644 index 3c7a87668ad17..0000000000000 --- a/DQM/Integration/python/clients/hcaltiming_dqm_sourceclient-live_cfg.py +++ /dev/null @@ -1,70 +0,0 @@ -import FWCore.ParameterSet.Config as cms -process = cms.Process("HcalTimingTest") - -process.load("DQM.Integration.config.inputsource_cfi") - -print "Running with run type = ", process.runType.getRunType() - -# Set this to True if running in Heavy Ion mode -HEAVYION=False -if runType == runTypes.hi_run: - HEAVYION=True - -process.DQMEventStreamHttpReader.consumerName = 'Hcal Timing DQM Consumer' - -process.MessageLogger = cms.Service("MessageLogger", - categories = cms.untracked.vstring(''), - destinations = cms.untracked.vstring('cout'), - debugModules = cms.untracked.vstring('*'), - cout = cms.untracked.PSet( - threshold = cms.untracked.string('WARNING'), - WARNING = cms.untracked.PSet(limit = cms.untracked.int32(0)) - ) -) - -process.load("EventFilter.HcalRawToDigi.HcalRawToDigi_cfi") - -process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("L1Trigger.Configuration.L1DummyConfig_cff") -process.load("EventFilter.L1GlobalTriggerRawToDigi.l1GtUnpack_cfi") -process.l1GtUnpack.DaqGtInputTag = 'source' - -process.load("DQM.HcalMonitorModule.HcalTimingModule_cfi") - -#----------------------------- -# Hcal Conditions: from Global Conditions Tag -#----------------------------- - -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -process.GlobalTag.connect = "frontier://(proxyurl=http://localhost:3128)(serverurl=http://frontier1.cms:8000/FrontierOnProd)(serverurl=http://frontier2.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)/CMS_COND_31X_GLOBALTAG" -process.GlobalTag.globaltag = 'GR_H_V37' # or any other appropriate -process.es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag') - - -### include to get DQM histogramming services -process.load("DQMServices.Core.DQM_cfg") -### set the verbose -process.DQMStore.verbose = 0 -#### BEGIN DQM Online Environment ####################### -### replace YourSubsystemName by the name of your source ### -### use it for dqmEnv, dqmSaver -process.load("DQM.Integration.config.environment_cfi") -### path where to save the output file -#process.dqmSaver.path = '.' -process.dqmEnv.subSystemFolder = 'HcalTiming' -process.dqmSaver.tag = 'HcalTiming' - -process.p = cms.Path(process.hcalDigis*process.l1GtUnpack*process.hcalTimingMonitor*process.dqmEnv*process.dqmSaver) - -### process customizations included here -from DQM.Integration.config.online_customizations_cfi import * -process = customise(process) - -#-------------------------------------------------- -# Heavy Ion Specific Fed Raw Data Collection Label -#-------------------------------------------------- -if (HEAVYION): - process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker") - process.l1GtUnpack.DaqGtInputTag = cms.InputTag("rawDataRepacker") - - 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 4845d64d96d26..73d1f21f8c6fd 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -27,8 +27,6 @@ # Condition for P5 cluster process.load("DQM.Integration.config.FrontierCondition_GT_cfi") -es_prefer_GlobalTag = cms.ESPrefer('GlobalTag') -process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) # Condition for lxplus #process.load("DQM.Integration.config.FrontierCondition_GT_Offline_cfi") @@ -48,26 +46,17 @@ process.load("DQM.L1TMonitor.L1TStage2_cff") process.rawToDigiPath = cms.Path(process.RawToDigi) -process.RawToDigi.remove("siPixelDigis") -process.RawToDigi.remove("siStripDigis") -process.RawToDigi.remove("scalersRawToDigi") -process.RawToDigi.remove("castorDigis") -process.L1TMuonEmulation.remove("emptyCaloCollsProducer") -process.emptyCaloCollsProducer.InputLabel = cms.InputTag("rawDataCollector") # for GCT, unpack all five samples process.gctDigis.numberOfGctSamplesToUnpack = cms.uint32(5) process.gtDigis.DaqGtFedId = cms.untracked.int32(813) -process.stage1UnpackPath = cms.Path(process.caloStage1LegacyFormatDigis+process.caloStage1Digis) process.stage2UnpackPath = cms.Path(process.caloStage2Digis+process.gmtStage2Digis) -process.l1tMonitorPath = cms.Path(process.l1tMonitorStage1Online+process.l1tStage2online) -#process.l1tMonitorClientPath = cms.Path(process.l1tMonitorStage1Client+process.l1tMonitorStage2Client) +process.l1tMonitorPath = cms.Path(process.l1tStage2online) process.l1tMonitorEndPath = cms.EndPath(process.l1tMonitorEndPathSeq) -#process.l1tMonitorClientEndPath = cms.EndPath(process.l1tMonitorClientEndPathSeq) process.dqmEndPath = cms.EndPath( process.dqmEnv * @@ -75,10 +64,8 @@ ) process.schedule = cms.Schedule(process.rawToDigiPath, - process.stage1UnpackPath, process.stage2UnpackPath, process.l1tMonitorPath, - process.l1tSyncPath, #process.l1tMonitorClientPath, process.l1tMonitorEndPath, #process.l1tMonitorClientEndPath, 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 01202c3bdf5ed..d31e70acb30dc 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -26,16 +26,15 @@ #process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ################ Condition ###################### -process.load("CondCore.DBCommon.CondDBSetup_cfi") - -############# DQM Cetral Modules ################ -#process.load("DQMServices.Core.DQM_cfg") # Condition for P5 cluster process.load("DQM.Integration.config.FrontierCondition_GT_cfi") # Condition for lxplus #process.load("DQM.Integration.config.FrontierCondition_GT_Offline_cfi") process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) +############# DQM Cetral Modules ################ +#process.load("DQMServices.Core.DQM_cfg") + ############## DQM Enviroment ################### process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'RPC' diff --git a/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py index 74f768c03a47a..0d6f3a7ce8110 100644 --- a/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py +++ b/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * GlobalTag.connect = "frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS" GlobalTag.pfnPrefix = cms.untracked.string("frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/") -GlobalTag.globaltag = "GR_E_V42" +GlobalTag.globaltag = "80X_dataRun2_Express_v0" es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag') # ===== auto -> Automatically get the GT string from current Tier0 configuration via a Tier0Das call. diff --git a/DQM/Integration/python/config/FrontierCondition_GT_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_cfi.py index 5ae229a3a2ad1..b8840dc8e6ba7 100644 --- a/DQM/Integration/python/config/FrontierCondition_GT_cfi.py +++ b/DQM/Integration/python/config/FrontierCondition_GT_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * GlobalTag.connect = cms.string("frontier://(proxyurl=http://localhost:3128)(serverurl=http://localhost:8000/FrontierOnProd)(serverurl=http://localhost:8000/FrontierOnProd)(retrieve-ziplevel=0)(failovertoserver=no)/CMS_CONDITIONS") -GlobalTag.globaltag = "75X_dataRun2_HLTHI_v4" +GlobalTag.globaltag = "80X_dataRun2_HLT_v2" es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag') diff --git a/DQM/TrigXMonitor/interface/L1Scalers.h b/DQM/TrigXMonitor/interface/L1Scalers.h index e6f742efdf880..f697ee5dbdc3b 100644 --- a/DQM/TrigXMonitor/interface/L1Scalers.h +++ b/DQM/TrigXMonitor/interface/L1Scalers.h @@ -8,6 +8,9 @@ #include "DQMServices/Core/interface/DQMEDAnalyzer.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" +#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h" + #define MAX_LUMI_SEG 2000 #define MAX_LUMI_BIN 400 @@ -26,7 +29,8 @@ class L1Scalers : public DQMEDAnalyzer { int nev_; // Number of events processed bool verbose_; - edm::InputTag l1GtDataSource_; // L1 Scalers + edm::EDGetTokenT l1GtDataSource_; // L1 Scalers + edm::EDGetTokenT l1GmtDataSource_; // L1 Scalers bool denomIsTech_; unsigned int denomBit_; diff --git a/DQM/TrigXMonitor/interface/L1TScalersSCAL.h b/DQM/TrigXMonitor/interface/L1TScalersSCAL.h index 50f3561084fe8..0eb4379a95988 100644 --- a/DQM/TrigXMonitor/interface/L1TScalersSCAL.h +++ b/DQM/TrigXMonitor/interface/L1TScalersSCAL.h @@ -9,6 +9,10 @@ #include "DQMServices/Core/interface/MonitorElement.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/Scalers/interface/Level1TriggerScalers.h" +#include "DataFormats/Scalers/interface/LumiScalers.h" +#include "DataFormats/Scalers/interface/L1AcceptBunchCrossing.h" + class L1TScalersSCAL : public DQMEDAnalyzer { public: enum { N_LUMISECTION_TIME = 93 }; @@ -19,7 +23,9 @@ class L1TScalersSCAL : public DQMEDAnalyzer { edm::EventSetup const &) override; void analyze(const edm::Event& e, const edm::EventSetup& c); private: - edm::InputTag scalersSource_; + edm::EDGetTokenT l1triggerscalers_; + edm::EDGetTokenT lumiscalers_; + edm::EDGetTokenT l1acceptBX_; bool verbose_, denomIsTech_, monitorDaemon_; unsigned int denomBit_, muonBit_, egammaBit_, jetBit_; diff --git a/DQM/TrigXMonitor/src/L1Scalers.cc b/DQM/TrigXMonitor/src/L1Scalers.cc index 5b4f50aaabe74..0c653b341a398 100644 --- a/DQM/TrigXMonitor/src/L1Scalers.cc +++ b/DQM/TrigXMonitor/src/L1Scalers.cc @@ -37,7 +37,8 @@ using namespace edm; L1Scalers::L1Scalers(const edm::ParameterSet& ps) : nev_(0), verbose_(ps.getUntrackedParameter("verbose", false)), - l1GtDataSource_(ps.getParameter("l1GtData")), + l1GtDataSource_(consumes(ps.getParameter("l1GtData"))), + l1GmtDataSource_(consumes(ps.getParameter("l1GtData"))), denomIsTech_(ps.getUntrackedParameter("denomIsTech", true)), denomBit_(ps.getUntrackedParameter("denomBit", 40)), tfIsTech_(ps.getUntrackedParameter("tfIsTech", true)), @@ -165,11 +166,10 @@ void L1Scalers::analyze(const edm::Event& e, const edm::EventSetup& iSetup) { // get Global Trigger decision and the decision word // these are locally derived edm::Handle gtRecord; - bool t = e.getByLabel(l1GtDataSource_, gtRecord); + bool t = e.getByToken(l1GtDataSource_, gtRecord); if (!t) { - LogDebug("Product") << "can't find L1GlobalTriggerReadoutRecord " - << "with label " << l1GtDataSource_.label(); + LogDebug("Product") << "can't find L1GlobalTriggerReadoutRecord"; } else { L1GtfeWord gtfeWord = gtRecord->gtfeWord(); int gtfeBx = gtfeWord.bxNr(); @@ -247,12 +247,11 @@ void L1Scalers::analyze(const edm::Event& e, const edm::EventSetup& iSetup) { // GMT information edm::Handle gmtCollection; - e.getByLabel(l1GtDataSource_, gmtCollection); + e.getByToken(l1GmtDataSource_, gmtCollection); if (!gmtCollection.isValid()) { edm::LogInfo("DataNotFound") - << "can't find L1MuGMTReadoutCollection with label " - << l1GtDataSource_.label(); + << "can't find L1MuGMTReadoutCollection with label"; } // remember the bx of 1st candidate of each system (9=none) diff --git a/DQM/TrigXMonitor/src/L1TScalersSCAL.cc b/DQM/TrigXMonitor/src/L1TScalersSCAL.cc index 28a070d7fcf55..d2eca1fe166df 100644 --- a/DQM/TrigXMonitor/src/L1TScalersSCAL.cc +++ b/DQM/TrigXMonitor/src/L1TScalersSCAL.cc @@ -26,16 +26,18 @@ const double SECS_PER_LUMI = 23.31040958083832; using namespace edm; using namespace std; -L1TScalersSCAL::L1TScalersSCAL(const edm::ParameterSet& ps) - : scalersSource_(ps.getParameter("scalersResults")), - verbose_(ps.getUntrackedParameter("verbose", false)), - denomIsTech_(ps.getUntrackedParameter("denomIsTech", true)), - denomBit_(ps.getUntrackedParameter("denomBit", 40)), - muonBit_(ps.getUntrackedParameter("muonBit", 55)), - egammaBit_(ps.getUntrackedParameter("egammaBit", 46)), - jetBit_(ps.getUntrackedParameter("jetBit", 15)) { +L1TScalersSCAL::L1TScalersSCAL(const edm::ParameterSet& ps): + l1triggerscalers_(consumes(ps.getParameter("scalersResults"))), + lumiscalers_(consumes(ps.getParameter("scalersResults"))), + l1acceptBX_(consumes(ps.getParameter("scalersResults"))), + verbose_(ps.getUntrackedParameter("verbose", false)), + denomIsTech_(ps.getUntrackedParameter("denomIsTech", true)), + denomBit_(ps.getUntrackedParameter("denomBit", 40)), + muonBit_(ps.getUntrackedParameter("muonBit", 55)), + egammaBit_(ps.getUntrackedParameter("egammaBit", 46)), + jetBit_(ps.getUntrackedParameter("jetBit", 15)) { LogDebug("Status") << "constructor"; - + for (int i = 0; i < Level1TriggerScalers::nLevel1Triggers; i++) { bufferAlgoRates_.push_back(0); algorithmRates_.push_back(0); @@ -287,17 +289,17 @@ void L1TScalersSCAL::analyze(const edm::Event& iEvent, nev_++; // access SCAL info edm::Handle triggerScalers; - bool a = iEvent.getByLabel(scalersSource_, triggerScalers); + bool a = iEvent.getByToken(l1triggerscalers_, triggerScalers); edm::Handle lumiScalers; - bool c = iEvent.getByLabel(scalersSource_, lumiScalers); + bool c = iEvent.getByToken(lumiscalers_, lumiScalers); edm::Handle bunchCrossings; - bool d = iEvent.getByLabel(scalersSource_, bunchCrossings); + bool d = iEvent.getByToken(l1acceptBX_, bunchCrossings); double evtLumi = iEvent.luminosityBlock(); int run = iEvent.id().run(); if (!(a && c && d)) { - LogInfo("Status") << "getByLabel failed with label " << scalersSource_; + LogInfo("Status") << "getByToken failed"; } else { // we have the data Level1TriggerScalersCollection::const_iterator it = triggerScalers->begin(); if (triggerScalers->size()) { @@ -470,5 +472,5 @@ void L1TScalersSCAL::analyze(const edm::Event& iEvent, bunchCrossingDiff_small[l1accept - 1]->Fill(bxdiff); } } - } // getByLabel succeeds for scalers + } // getByToken succeeds for scalers } diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h index a28814e63861c..79138c44f490b 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h +++ b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h @@ -28,6 +28,8 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/InputTag.h" +#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" + // forward declarations class L1GtTriggerMask; @@ -64,7 +66,7 @@ class L1GlobalTriggerRecordProducer : public edm::stream::EDProducer<> private: /// InputTag for the L1 Global Trigger DAQ readout record - edm::InputTag m_l1GtReadoutRecordTag; + edm::EDGetTokenT m_l1GtReadoutRecordTag; }; diff --git a/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc b/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc index cfc547a1a0674..6a63a196b1519 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc +++ b/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc @@ -20,7 +20,6 @@ #include // user include files -#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h" #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerRecord.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -43,8 +42,7 @@ L1GlobalTriggerRecordProducer::L1GlobalTriggerRecordProducer(const edm::Paramete produces(); // input tag for DAQ GT record - m_l1GtReadoutRecordTag = - parSet.getParameter("L1GtReadoutRecordTag"); + m_l1GtReadoutRecordTag = consumes(parSet.getParameter("L1GtReadoutRecordTag")); LogDebug("L1GlobalTriggerRecordProducer") << "\nInput tag for L1 GT DAQ record: " @@ -78,7 +76,7 @@ void L1GlobalTriggerRecordProducer::produce(edm::Event& iEvent, const edm::Event // get L1GlobalTriggerReadoutRecord edm::Handle gtReadoutRecord; - iEvent.getByLabel(m_l1GtReadoutRecordTag, gtReadoutRecord); + iEvent.getByToken(m_l1GtReadoutRecordTag, gtReadoutRecord); if (!gtReadoutRecord.isValid()) {