diff --git a/CommonTools/TriggerUtils/BuildFile.xml b/CommonTools/TriggerUtils/BuildFile.xml
index f14529836e414..f4dce0a0bf9ea 100644
--- a/CommonTools/TriggerUtils/BuildFile.xml
+++ b/CommonTools/TriggerUtils/BuildFile.xml
@@ -1,6 +1,7 @@
+
diff --git a/CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h b/CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h
index 3dacadb4f576e..aa408df09ecbc 100644
--- a/CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h
+++ b/CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h
@@ -32,6 +32,7 @@
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "DataFormats/OnlineMetaData/interface/DCSRecord.h"
#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"
#include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"
#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
@@ -54,7 +55,9 @@ class GenericTriggerEventFlag {
unsigned verbose_;
bool andOrDcs_;
edm::InputTag dcsInputTag_;
+ edm::InputTag dcsRecordInputTag_;
edm::EDGetTokenT dcsInputToken_;
+ edm::EDGetTokenT dcsRecordToken_;
std::vector dcsPartitions_;
bool errorReplyDcs_;
bool andOrGt_;
@@ -145,7 +148,10 @@ class GenericTriggerEventFlag {
// DCS
bool acceptDcs(const edm::Event& event);
- bool acceptDcsPartition(const edm::Handle& dcsStatus, int dcsPartition) const;
+ bool acceptDcsPartition(const edm::Handle& dcsStatus,
+ const edm::Handle& dcsRecord,
+ bool useDCSRecord,
+ int dcsPartition) const;
// GT status bits
bool acceptGt(const edm::Event& event);
diff --git a/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc b/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc
index 8949ac63de935..1f44c1cb24d5f 100644
--- a/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc
+++ b/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc
@@ -77,6 +77,10 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
andOrDcs_ = config.getParameter("andOrDcs");
dcsInputTag_ = config.getParameter("dcsInputTag");
dcsInputToken_ = iC.mayConsume(dcsInputTag_);
+
+ dcsRecordInputTag_ = config.getParameter("dcsRecordInputTag");
+ dcsRecordToken_ = iC.mayConsume(dcsRecordInputTag_);
+
dcsPartitions_ = config.getParameter >("dcsPartitions");
errorReplyDcs_ = config.getParameter("errorReplyDcs");
} else {
@@ -278,22 +282,33 @@ bool GenericTriggerEventFlag::acceptDcs(const edm::Event& event) {
if (!onDcs_ || dcsPartitions_.empty())
return (!andOr_); // logically neutral, depending on base logical connective
+ bool useDCSRecord(false);
+
// Accessing the DcsStatusCollection
edm::Handle dcsStatus;
event.getByToken(dcsInputToken_, dcsStatus);
- if (!dcsStatus.isValid()) {
+
+ edm::Handle dcsRecord;
+ event.getByToken(dcsRecordToken_, dcsRecord);
+
+ if (!dcsStatus.isValid() && !dcsRecord.isValid()) {
if (verbose_ > 1)
edm::LogWarning("GenericTriggerEventFlag")
- << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode()
- << "\" not in event ==> decision: " << errorReplyDcs_;
+ << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode() << "\" not in event \n"
+ << "DCSRecord product with InputTag \"" << dcsRecordInputTag_.encode() << "\" not in event \n"
+ << " ==> decision: " << errorReplyDcs_;
return errorReplyDcs_;
}
if ((*dcsStatus).empty()) {
- if (verbose_ > 1)
- edm::LogWarning("GenericTriggerEventFlag")
- << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode()
- << "\" empty ==> decision: " << errorReplyDcs_;
- return errorReplyDcs_;
+ if (event.eventAuxiliary().isRealData()) {
+ useDCSRecord = true;
+ } else {
+ if (verbose_ > 1)
+ edm::LogWarning("GenericTriggerEventFlag")
+ << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode()
+ << "\" empty ==> decision: " << errorReplyDcs_;
+ return errorReplyDcs_;
+ }
}
// Determine decision of DCS partition combination and return
@@ -301,7 +316,7 @@ bool GenericTriggerEventFlag::acceptDcs(const edm::Event& event) {
for (std::vector::const_iterator partitionNumber = dcsPartitions_.begin();
partitionNumber != dcsPartitions_.end();
++partitionNumber) {
- if (acceptDcsPartition(dcsStatus, *partitionNumber))
+ if (acceptDcsPartition(dcsStatus, dcsRecord, useDCSRecord, *partitionNumber))
return true;
}
return false;
@@ -309,40 +324,90 @@ bool GenericTriggerEventFlag::acceptDcs(const edm::Event& event) {
for (std::vector::const_iterator partitionNumber = dcsPartitions_.begin();
partitionNumber != dcsPartitions_.end();
++partitionNumber) {
- if (!acceptDcsPartition(dcsStatus, *partitionNumber))
+ if (!acceptDcsPartition(dcsStatus, dcsRecord, useDCSRecord, *partitionNumber))
return false;
}
return true;
}
bool GenericTriggerEventFlag::acceptDcsPartition(const edm::Handle& dcsStatus,
+ const edm::Handle& dcsRecord,
+ bool useDCSRecord,
int dcsPartition) const {
+ int theDCSRecordPartition;
// Error checks
switch (dcsPartition) {
case DcsStatus::EBp:
+ theDCSRecordPartition = DCSRecord::EBp;
+ break;
case DcsStatus::EBm:
+ theDCSRecordPartition = DCSRecord::EBm;
+ break;
case DcsStatus::EEp:
+ theDCSRecordPartition = DCSRecord::EEp;
+ break;
case DcsStatus::EEm:
+ theDCSRecordPartition = DCSRecord::EBm;
+ break;
case DcsStatus::HBHEa:
+ theDCSRecordPartition = DCSRecord::HBHEa;
+ break;
case DcsStatus::HBHEb:
+ theDCSRecordPartition = DCSRecord::HBHEb;
+ break;
case DcsStatus::HBHEc:
+ theDCSRecordPartition = DCSRecord::HBHEc;
+ break;
case DcsStatus::HF:
+ theDCSRecordPartition = DCSRecord::HF;
+ break;
case DcsStatus::HO:
+ theDCSRecordPartition = DCSRecord::HO;
+ break;
case DcsStatus::RPC:
+ theDCSRecordPartition = DCSRecord::RPC;
+ break;
case DcsStatus::DT0:
+ theDCSRecordPartition = DCSRecord::DT0;
+ break;
case DcsStatus::DTp:
+ theDCSRecordPartition = DCSRecord::DTp;
+ break;
case DcsStatus::DTm:
+ theDCSRecordPartition = DCSRecord::DTm;
+ break;
case DcsStatus::CSCp:
+ theDCSRecordPartition = DCSRecord::CSCp;
+ break;
case DcsStatus::CSCm:
+ theDCSRecordPartition = DCSRecord::CSCm;
+ break;
case DcsStatus::CASTOR:
+ theDCSRecordPartition = DCSRecord::CASTOR;
+ break;
case DcsStatus::TIBTID:
+ theDCSRecordPartition = DCSRecord::TIBTID;
+ break;
case DcsStatus::TOB:
+ theDCSRecordPartition = DCSRecord::TOB;
+ break;
case DcsStatus::TECp:
+ theDCSRecordPartition = DCSRecord::TECp;
+ break;
case DcsStatus::TECm:
+ theDCSRecordPartition = DCSRecord::TECm;
+ break;
case DcsStatus::BPIX:
+ theDCSRecordPartition = DCSRecord::BPIX;
+ break;
case DcsStatus::FPIX:
+ theDCSRecordPartition = DCSRecord::FPIX;
+ break;
case DcsStatus::ESp:
+ theDCSRecordPartition = DCSRecord::ESp;
+ break;
case DcsStatus::ESm:
+ theDCSRecordPartition = DCSRecord::ESm;
break;
default:
if (verbose_ > 1)
@@ -352,7 +417,17 @@ bool GenericTriggerEventFlag::acceptDcsPartition(const edm::Handleat(0).ready(dcsPartition);
+ if (!useDCSRecord) {
+ return dcsStatus->at(0).ready(dcsPartition);
+ } else {
+ if (verbose_ > 2) {
+ LogDebug("GenericTriggerEventFlag")
+ << "using dcs record, dcsPartition:" << dcsPartition << " " << theDCSRecordPartition << " "
+ << (*dcsRecord).partitionName(theDCSRecordPartition) << " "
+ << (*dcsRecord).highVoltageReady(theDCSRecordPartition) << std::endl;
+ }
+ return (*dcsRecord).highVoltageReady(theDCSRecordPartition);
+ }
}
/// Does this event fulfill the configured GT status logical expression combination?
diff --git a/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py b/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py
index b8c2c4f3f0046..3eb16302732de 100644
--- a/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py
+++ b/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py
@@ -243,6 +243,7 @@
andOr = cms.bool( False ),
### DCS selection
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQM/SiPixelPhase1Common/python/TriggerEventFlag_cfi.py b/DQM/SiPixelPhase1Common/python/TriggerEventFlag_cfi.py
index fcec57cdd2e99..13c7e671cad02 100644
--- a/DQM/SiPixelPhase1Common/python/TriggerEventFlag_cfi.py
+++ b/DQM/SiPixelPhase1Common/python/TriggerEventFlag_cfi.py
@@ -26,6 +26,7 @@
PixelDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag ( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32 ( 28, 29),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py
index 2753230de035e..b099c48f8bceb 100644
--- a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py
+++ b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py
@@ -18,6 +18,7 @@
SiStripMonitorCluster.PixelDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32 ( 28, 29),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -25,6 +26,7 @@
SiStripMonitorCluster.StripDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py b/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
index 656b68f516b80..d2434687ebb02 100644
--- a/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
+++ b/DQM/SiStripMonitorCluster/python/SiStripMonitorCluster_cfi.py
@@ -25,6 +25,7 @@
PixelDCSfilter = cms.PSet(
andOr = cms.bool(False),
dcsInputTag = cms.InputTag("scalersRawToDigi"),
+ dcsRecordInputTag = cms.InputTag( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32(28, 29),
andOrDcs = cms.bool(False),
errorReplyDcs = cms.bool(True)
@@ -32,6 +33,7 @@
StripDCSfilter = cms.PSet(
andOr = cms.bool(False),
dcsInputTag = cms.InputTag("scalersRawToDigi"),
+ dcsRecordInputTag = cms.InputTag( "onlineMetaDataDigis" ),
dcsPartitions = cms.vint32(24, 25, 26, 27),
andOrDcs = cms.bool(False),
errorReplyDcs = cms.bool(True)
diff --git a/DQM/TrackingMonitorSource/python/pset4GenericTriggerEventFlag_cfi.py b/DQM/TrackingMonitorSource/python/pset4GenericTriggerEventFlag_cfi.py
index 1a4eba70d3d0e..0d883a2bfdddb 100644
--- a/DQM/TrackingMonitorSource/python/pset4GenericTriggerEventFlag_cfi.py
+++ b/DQM/TrackingMonitorSource/python/pset4GenericTriggerEventFlag_cfi.py
@@ -3,6 +3,7 @@
genericTriggerEventFlag4fullTracker = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -10,6 +11,7 @@
genericTriggerEventFlag4onlyStrip = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -17,6 +19,7 @@
genericTriggerEventFlag4fullTrackerAndHLTdb = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -32,6 +35,7 @@
genericTriggerEventFlag4fullTrackerAndHLTnoHIPnoOOTdb = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -47,6 +51,7 @@
genericTriggerEventFlag4fullTrackerAndHLTHIPnoOOTdb = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -62,6 +67,7 @@
genericTriggerEventFlag4fullTrackerAndHLTHIPOOTdb = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc b/DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc
index a30b0a94d92ee..56c69f207e348 100644
--- a/DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc
+++ b/DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc
@@ -293,6 +293,7 @@ void TrackToTrackComparisonHists::fillDescriptions(edm::ConfigurationDescription
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr", false);
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {24, 25, 26, 27, 28, 29}); // 24-27: strip, 28-29
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/JetMET/python/jetMETDQMCleanup_cff.py b/DQMOffline/JetMET/python/jetMETDQMCleanup_cff.py
index 08ed099f92e7a..157494f03190f 100644
--- a/DQMOffline/JetMET/python/jetMETDQMCleanup_cff.py
+++ b/DQMOffline/JetMET/python/jetMETDQMCleanup_cff.py
@@ -7,6 +7,7 @@
andOr = cms.bool( False ),
#dbLabel = cms.string( 'jetmet_trigsel' ), # will be discussed below (DB)
#dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ #dcsRecordInputTag = cms.InputTag ( "onlineMetaDataDigis" ),
#dcsPartitions = cms.vint32( 24, 25, 26, 27 ),
#andOrDcs = cms.bool( False ),
#errorReplyDcs = cms.bool( False ),
diff --git a/DQMOffline/Trigger/interface/HLTDQMTagAndProbeEff.h b/DQMOffline/Trigger/interface/HLTDQMTagAndProbeEff.h
index 719eefa5fd5c0..5d652cecb327c 100644
--- a/DQMOffline/Trigger/interface/HLTDQMTagAndProbeEff.h
+++ b/DQMOffline/Trigger/interface/HLTDQMTagAndProbeEff.h
@@ -181,6 +181,7 @@ edm::ParameterSetDescription HLTDQMTagAndProbeEff("verbosityLevel", 1);
trigEvtFlagDesc.add("andOrDcs", false);
trigEvtFlagDesc.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ trigEvtFlagDesc.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
trigEvtFlagDesc.add >("dcsPartitions", {24, 25, 26, 27, 28, 29});
trigEvtFlagDesc.add("errorReplyDcs", true);
trigEvtFlagDesc.add("dbLabel", "");
diff --git a/DQMOffline/Trigger/plugins/BPHMonitor.cc b/DQMOffline/Trigger/plugins/BPHMonitor.cc
index a3dd4f859834f..e086558ff17da 100644
--- a/DQMOffline/Trigger/plugins/BPHMonitor.cc
+++ b/DQMOffline/Trigger/plugins/BPHMonitor.cc
@@ -1247,6 +1247,7 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add>("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
diff --git a/DQMOffline/Trigger/plugins/DiDispStaMuonMonitor.cc b/DQMOffline/Trigger/plugins/DiDispStaMuonMonitor.cc
index e8a76731871aa..4e8193b159a21 100644
--- a/DQMOffline/Trigger/plugins/DiDispStaMuonMonitor.cc
+++ b/DQMOffline/Trigger/plugins/DiDispStaMuonMonitor.cc
@@ -360,6 +360,7 @@ void DiDispStaMuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& desc
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add>("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/DiJetMonitor.cc b/DQMOffline/Trigger/plugins/DiJetMonitor.cc
index f3e3b0c9e1770..cba8aafe87e11 100644
--- a/DQMOffline/Trigger/plugins/DiJetMonitor.cc
+++ b/DQMOffline/Trigger/plugins/DiJetMonitor.cc
@@ -437,6 +437,7 @@ void DiJetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/HTMonitor.cc b/DQMOffline/Trigger/plugins/HTMonitor.cc
index a9abde67eb4d5..3f78ca497d81d 100644
--- a/DQMOffline/Trigger/plugins/HTMonitor.cc
+++ b/DQMOffline/Trigger/plugins/HTMonitor.cc
@@ -462,6 +462,7 @@ void HTMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/JetMonitor.cc b/DQMOffline/Trigger/plugins/JetMonitor.cc
index 55bb731fd44d3..47f8255c1c503 100644
--- a/DQMOffline/Trigger/plugins/JetMonitor.cc
+++ b/DQMOffline/Trigger/plugins/JetMonitor.cc
@@ -658,6 +658,7 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/METMonitor.cc b/DQMOffline/Trigger/plugins/METMonitor.cc
index beb8345ee9b3f..2c3b1e0b2f8e5 100644
--- a/DQMOffline/Trigger/plugins/METMonitor.cc
+++ b/DQMOffline/Trigger/plugins/METMonitor.cc
@@ -381,6 +381,7 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/METplusTrackMonitor.cc b/DQMOffline/Trigger/plugins/METplusTrackMonitor.cc
index b6a200c3e3ed7..8beb561138550 100644
--- a/DQMOffline/Trigger/plugins/METplusTrackMonitor.cc
+++ b/DQMOffline/Trigger/plugins/METplusTrackMonitor.cc
@@ -444,6 +444,7 @@ void METplusTrackMonitor::fillDescriptions(edm::ConfigurationDescriptions& descr
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/MuonMonitor.cc b/DQMOffline/Trigger/plugins/MuonMonitor.cc
index 2988f86ebeaf5..77e5fbbccddc8 100644
--- a/DQMOffline/Trigger/plugins/MuonMonitor.cc
+++ b/DQMOffline/Trigger/plugins/MuonMonitor.cc
@@ -357,6 +357,7 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add>("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/NoBPTXMonitor.cc b/DQMOffline/Trigger/plugins/NoBPTXMonitor.cc
index cdba88d6e994b..7fbf15881bdd8 100644
--- a/DQMOffline/Trigger/plugins/NoBPTXMonitor.cc
+++ b/DQMOffline/Trigger/plugins/NoBPTXMonitor.cc
@@ -477,6 +477,7 @@ void NoBPTXMonitor::fillDescriptions(edm::ConfigurationDescriptions& description
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/ObjMonitor.cc b/DQMOffline/Trigger/plugins/ObjMonitor.cc
index 0656a99523143..f5ac9fe1d9e79 100644
--- a/DQMOffline/Trigger/plugins/ObjMonitor.cc
+++ b/DQMOffline/Trigger/plugins/ObjMonitor.cc
@@ -399,6 +399,7 @@ void ObjMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/PhotonMonitor.cc b/DQMOffline/Trigger/plugins/PhotonMonitor.cc
index 4b9798bbdfd22..aba9157ca942e 100644
--- a/DQMOffline/Trigger/plugins/PhotonMonitor.cc
+++ b/DQMOffline/Trigger/plugins/PhotonMonitor.cc
@@ -418,6 +418,7 @@ void PhotonMonitor::fillDescriptions(edm::ConfigurationDescriptions& description
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/RazorMonitor.cc b/DQMOffline/Trigger/plugins/RazorMonitor.cc
index fd02ac822abbc..1b0942f589cc5 100644
--- a/DQMOffline/Trigger/plugins/RazorMonitor.cc
+++ b/DQMOffline/Trigger/plugins/RazorMonitor.cc
@@ -292,6 +292,7 @@ void RazorMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/Tau3MuMonitor.cc b/DQMOffline/Trigger/plugins/Tau3MuMonitor.cc
index 96846a1d4c674..cb32baeb7b524 100644
--- a/DQMOffline/Trigger/plugins/Tau3MuMonitor.cc
+++ b/DQMOffline/Trigger/plugins/Tau3MuMonitor.cc
@@ -190,6 +190,7 @@ void Tau3MuMonitor::fillDescriptions(edm::ConfigurationDescriptions& description
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/plugins/TopMonitor.cc b/DQMOffline/Trigger/plugins/TopMonitor.cc
index d74fb9334e7b9..521a91a20a528 100644
--- a/DQMOffline/Trigger/plugins/TopMonitor.cc
+++ b/DQMOffline/Trigger/plugins/TopMonitor.cc
@@ -1416,6 +1416,7 @@ void TopMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add("andOr");
genericTriggerEventPSet.add("dcsInputTag", edm::InputTag("scalersRawToDigi"));
+ genericTriggerEventPSet.add("dcsRecordInputTag", edm::InputTag("onlineMetaDataDigis"));
genericTriggerEventPSet.add >("dcsPartitions", {});
genericTriggerEventPSet.add("andOrDcs", false);
genericTriggerEventPSet.add("errorReplyDcs", true);
diff --git a/DQMOffline/Trigger/python/BPHMonitor_cfi.py b/DQMOffline/Trigger/python/BPHMonitor_cfi.py
index 9ac7bb1543a5d..9bdd053ba209c 100644
--- a/DQMOffline/Trigger/python/BPHMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/BPHMonitor_cfi.py
@@ -107,6 +107,7 @@
hltBPHmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltBPHmonitoring.denGenericTriggerEventPSet.andOrHlt = cms.bool(True)# True:=OR; False:=AND
#hltBPHmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+#hltBPHmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltBPHmonitoring.denGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
hltBPHmonitoring.denGenericTriggerEventPSet.hltPaths = cms.vstring( "HLT_Mu7p5_Track2_Jpsi_v*" )#reference
#hltBPHmonitoring.denGenericTriggerEventPSet.l1Algorithms = cms.vstring("L1_DoubleMu0_SQ") # HLT_ZeroBias_v*
diff --git a/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py b/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py
index 9e159f5b7f613..06d72a48b0514 100644
--- a/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py
@@ -108,6 +108,7 @@
hltBTVmonitoring.denGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
hltBTVmonitoring.denGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
hltBTVmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltBTVmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltBTVmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltBTVmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltBTVmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/DiDispStaMuonMonitor_cfi.py b/DQMOffline/Trigger/python/DiDispStaMuonMonitor_cfi.py
index 2a0c67d8a75ec..0d7fdbd152e26 100644
--- a/DQMOffline/Trigger/python/DiDispStaMuonMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/DiDispStaMuonMonitor_cfi.py
@@ -51,6 +51,7 @@
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.andOrHlt = cms.bool(True)# True:=OR; False:=AND
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltDiDispStaMuonMonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/DiJetMonitor_cfi.py b/DQMOffline/Trigger/python/DiJetMonitor_cfi.py
index 1bbe2dbb34c2f..f06ae75268308 100644
--- a/DQMOffline/Trigger/python/DiJetMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/DiJetMonitor_cfi.py
@@ -30,6 +30,7 @@
DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
DiPFjetAve40_Prommonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/HTMonitor_cfi.py b/DQMOffline/Trigger/python/HTMonitor_cfi.py
index bc152cb15e9dd..d38b4b566e593 100644
--- a/DQMOffline/Trigger/python/HTMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/HTMonitor_cfi.py
@@ -30,6 +30,7 @@
hltHTmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltHTmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltHTmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltHTmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltHTmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltHTmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py b/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py
index 796cd4a1790ef..5cbb66612646c 100644
--- a/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py
+++ b/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py
@@ -122,6 +122,7 @@
hltHIGmonitoring.numGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
hltHIGmonitoring.numGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
hltHIGmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltHIGmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltHIGmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltHIGmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltHIGmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/JetMonitor_cfi.py b/DQMOffline/Trigger/python/JetMonitor_cfi.py
index d521e5e3938d8..240ff3781f34b 100644
--- a/DQMOffline/Trigger/python/JetMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/JetMonitor_cfi.py
@@ -34,6 +34,7 @@
hltJetMETmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltJetMETmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltJetMETmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltJetMETmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltJetMETmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltJetMETmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/LepHTMonitor_cff.py b/DQMOffline/Trigger/python/LepHTMonitor_cff.py
index ec9b3dab1650b..1b5398dad21f9 100644
--- a/DQMOffline/Trigger/python/LepHTMonitor_cff.py
+++ b/DQMOffline/Trigger/python/LepHTMonitor_cff.py
@@ -63,6 +63,7 @@
hltPaths = cms.vstring("HLT_PFHT1050_v*"),
errorReplyHlt = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ), # 24-27: strip, 28-29: pixel, we should add all other detectors !
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -75,6 +76,7 @@
hltPaths = cms.vstring("HLT_Ele38_WPTight_Gsf_v*","HLT_Ele27_WPTight_Gsf_v*","HLT_Ele35_WPTight_Gsf_v*","HLT_Ele40_WPTight_Gsf_v*"),
errorReplyHlt = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ), # 24-27: strip, 28-29: pixel, we should add all other detectors !
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQMOffline/Trigger/python/METMonitor_cfi.py b/DQMOffline/Trigger/python/METMonitor_cfi.py
index 0604c6378069b..36fc8ad46a5cf 100644
--- a/DQMOffline/Trigger/python/METMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/METMonitor_cfi.py
@@ -31,6 +31,7 @@
hltMETmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltMETmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltMETmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltMETmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltMETmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltMETmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py b/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py
index 40d7f883429b1..4feeded237afc 100644
--- a/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py
@@ -62,6 +62,7 @@
hltMETplusTrackMonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltMETplusTrackMonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltMETplusTrackMonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltMETplusTrackMonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltMETplusTrackMonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltMETplusTrackMonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/MjjMonitor_cfi.py b/DQMOffline/Trigger/python/MjjMonitor_cfi.py
index 8273ef65f6e04..1f42ccb496dc2 100644
--- a/DQMOffline/Trigger/python/MjjMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/MjjMonitor_cfi.py
@@ -30,6 +30,7 @@
hltMjjmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltMjjmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltMjjmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag ( "onlineMetaDataDigis" )
hltMjjmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29
hltMjjmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltMjjmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/MssmHbbBtagTriggerMonitor_cfi.py b/DQMOffline/Trigger/python/MssmHbbBtagTriggerMonitor_cfi.py
index 8996994807c4e..78dc90a10fd14 100644
--- a/DQMOffline/Trigger/python/MssmHbbBtagTriggerMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/MssmHbbBtagTriggerMonitor_cfi.py
@@ -4,6 +4,7 @@
triggerFlagPSet = cms.PSet(
dcsInputTag = cms.InputTag('scalersRawToDigi'),
+ dcsRecordInputTag = cms.InputTag('onlineMetaDataDigis'),
dcsPartitions = cms.vint32( 24, 25, 26, 27, 28, 29 ),
andOrDcs = cms.bool(False),
errorReplyDcs = cms.bool(True),
diff --git a/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py b/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py
index 63b1662a88597..59c866c1b12db 100644
--- a/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py
+++ b/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py
@@ -124,6 +124,7 @@
mssmHbbMonitoring.denGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults::HLT" ) #change to HLT for PR !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
mssmHbbMonitoring.denGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
mssmHbbMonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+mssmHbbMonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
mssmHbbMonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
mssmHbbMonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
mssmHbbMonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/MuonMonitor_cfi.py b/DQMOffline/Trigger/python/MuonMonitor_cfi.py
index bd2768127dc67..95cbce5811ab9 100644
--- a/DQMOffline/Trigger/python/MuonMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/MuonMonitor_cfi.py
@@ -34,6 +34,7 @@
hltMuonmonitoring.denGenericTriggerEventPSet.hltPaths = cms.vstring("") # HLT_ZeroBias_v*
hltMuonmonitoring.denGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
hltMuonmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltMuonmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltMuonmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltMuonmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltMuonmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/NoBPTXMonitor_cfi.py b/DQMOffline/Trigger/python/NoBPTXMonitor_cfi.py
index d4c09323422f7..ce684ee6767e0 100644
--- a/DQMOffline/Trigger/python/NoBPTXMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/NoBPTXMonitor_cfi.py
@@ -56,6 +56,7 @@
hltNoBPTXmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltNoBPTXmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltNoBPTXmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltNoBPTXmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltNoBPTXmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltNoBPTXmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/ObjMonitor_cfi.py b/DQMOffline/Trigger/python/ObjMonitor_cfi.py
index e05dc9cd98306..f59f297bc6201 100644
--- a/DQMOffline/Trigger/python/ObjMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/ObjMonitor_cfi.py
@@ -67,6 +67,7 @@
hltobjmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltobjmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltobjmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltobjmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltobjmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltobjmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/PhotonMonitor_cfi.py b/DQMOffline/Trigger/python/PhotonMonitor_cfi.py
index 7037cfba6060f..f393bd32306b7 100644
--- a/DQMOffline/Trigger/python/PhotonMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/PhotonMonitor_cfi.py
@@ -34,6 +34,7 @@
hltPhotonmonitoring.denGenericTriggerEventPSet.hltPaths = cms.vstring("HLT_PFJet40_v*","HLT_PFJet60_v*","HLT_PFJet80_v*") # HLT_ZeroBias_v*
hltPhotonmonitoring.denGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
hltPhotonmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltPhotonmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltPhotonmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltPhotonmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltPhotonmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/RazorMonitor_cfi.py b/DQMOffline/Trigger/python/RazorMonitor_cfi.py
index 0137e097fb8ff..ea78db7f72c31 100644
--- a/DQMOffline/Trigger/python/RazorMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/RazorMonitor_cfi.py
@@ -18,6 +18,7 @@
hltRazorMonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltRazorMonitoring.denGenericTriggerEventPSet.andOrHlt = cms.bool( True )
hltRazorMonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltRazorMonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag ( "onlineMetaDataDigis" )
hltRazorMonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltRazorMonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltRazorMonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py
index 77ae67ffecb25..41c33162d50ad 100644
--- a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py
+++ b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py
@@ -33,6 +33,7 @@
HLTSiStripMonitorCluster.PixelDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 28, 29),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
@@ -40,6 +41,7 @@
HLTSiStripMonitorCluster.StripDCSfilter = cms.PSet(
andOr = cms.bool( False ),
dcsInputTag = cms.InputTag( "scalersRawToDigi" ),
+ dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis"),
dcsPartitions = cms.vint32 ( 24, 25, 26, 27 ),
andOrDcs = cms.bool( False ),
errorReplyDcs = cms.bool( True ),
diff --git a/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py b/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py
index 62e11f84b6676..a0ef3fa23e46f 100644
--- a/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py
@@ -31,6 +31,7 @@
hltSoftdropmonitoring.denGenericTriggerEventPSet.andOr = cms.bool( False )
hltSoftdropmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltSoftdropmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltSoftdropmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29
hltSoftdropmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltSoftdropmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/SusyMonitor_cfi.py b/DQMOffline/Trigger/python/SusyMonitor_cfi.py
index dedd22453a5b0..466b13cd141a2 100644
--- a/DQMOffline/Trigger/python/SusyMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/SusyMonitor_cfi.py
@@ -118,6 +118,7 @@
hltSUSYmonitoring.denGenericTriggerEventPSet.hltInputTag = cms.InputTag( "TriggerResults::HLT" )
hltSUSYmonitoring.denGenericTriggerEventPSet.errorReplyHlt = cms.bool( False )
hltSUSYmonitoring.denGenericTriggerEventPSet.dcsInputTag = cms.InputTag( "scalersRawToDigi" )
+hltSUSYmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = cms.InputTag("onlineMetaDataDigis")
hltSUSYmonitoring.denGenericTriggerEventPSet.dcsPartitions = cms.vint32 ( 24, 25, 26, 27, 28, 29 ) # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltSUSYmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltSUSYmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
diff --git a/DQMOffline/Trigger/python/TopMonitor_cfi.py b/DQMOffline/Trigger/python/TopMonitor_cfi.py
index b7be242ddd6f9..45a15d8e28a43 100644
--- a/DQMOffline/Trigger/python/TopMonitor_cfi.py
+++ b/DQMOffline/Trigger/python/TopMonitor_cfi.py
@@ -109,6 +109,7 @@
hltTOPmonitoring.denGenericTriggerEventPSet.hltInputTag = "TriggerResults::HLT"
hltTOPmonitoring.denGenericTriggerEventPSet.errorReplyHlt = False
hltTOPmonitoring.denGenericTriggerEventPSet.dcsInputTag = "scalersRawToDigi"
+hltTOPmonitoring.denGenericTriggerEventPSet.dcsRecordInputTag = "onlineMetaDataDigis"
hltTOPmonitoring.denGenericTriggerEventPSet.dcsPartitions = [24, 25, 26, 27, 28, 29] # 24-27: strip, 28-29: pixel, we should add all other detectors !
hltTOPmonitoring.denGenericTriggerEventPSet.andOrDcs = False
hltTOPmonitoring.denGenericTriggerEventPSet.errorReplyDcs = True