Merge pull request #11826 from sachikot/new_scal_onlinedqm_75X_2015_1…

…0_15_1100 Adding SCAL to Online DQM Monitoring
cms-sw · Nov 10, 2015 · d09caee · d09caee
2 parents f9c51b1 + 2ddb3c4
commit d09caee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/DQMServices/Components/src/DQMScalInfo.cc b/DQMServices/Components/src/DQMScalInfo.cc
@@ -18,6 +18,7 @@
 #include "DataFormats/Scalers/interface/LumiScalers.h"
 
 using namespace std;
+using namespace edm;
 
 
 // Framework
@@ -28,11 +29,10 @@ DQMScalInfo::DQMScalInfo(const edm::ParameterSet& ps)
   parameters_ = ps;
 
   scalfolder_          = parameters_.getUntrackedParameter<std::string>("dqmScalFolder", "Scal") ;
-  gtCollection_        = consumes<L1GlobalTriggerReadoutRecord>(parameters_.getUntrackedParameter<std::string>("gtCollection","gtDigis"));
-  dcsStatusCollection_ = consumes<DcsStatusCollection>(parameters_.getUntrackedParameter<std::string>("dcsStatusCollection","scalersRawToDigi"));
-  l1tscollectionToken_ = consumes<Level1TriggerScalersCollection>(parameters_.getUntrackedParameter<std::string>("l1TSCollection", "scalersRawToDigi"));
-  lumicollectionToken_ = consumes<LumiScalersCollection>(parameters_.getUntrackedParameter<std::string>("lumiCollection", "scalersRawToDigi"));
-
+  gtCollection_        = consumes<L1GlobalTriggerReadoutRecord>(parameters_.getUntrackedParameter<edm::InputTag>("gtCollection", edm::InputTag("gtDigis")));
+  dcsStatusCollection_ = consumes<DcsStatusCollection>(parameters_.getUntrackedParameter<edm::InputTag>("dcsStatusCollection", edm::InputTag("scalersRawToDigi")));
+  l1tscollectionToken_ = consumes<Level1TriggerScalersCollection>(parameters_.getUntrackedParameter<edm::InputTag>("l1TSCollection", edm::InputTag("scalersRawToDigi")));
+  lumicollectionToken_ = consumes<LumiScalersCollection>(parameters_.getUntrackedParameter<edm::InputTag>("lumiCollection", edm::InputTag("scalersRawToDigi")));
 }
 
 DQMScalInfo::~DQMScalInfo(){

diff --git a/DQMServices/Components/src/DQMScalInfo.h b/DQMServices/Components/src/DQMScalInfo.h
@@ -57,6 +57,7 @@ class DQMScalInfo: public DQMEDAnalyzer{
   edm::EDGetTokenT<DcsStatusCollection> dcsStatusCollection_;
   edm::EDGetTokenT<Level1TriggerScalersCollection> l1tscollectionToken_;
   edm::EDGetTokenT<LumiScalersCollection> lumicollectionToken_;
+
    // histograms
   MonitorElement * hlresync_;
   MonitorElement * hlOC0_;