L1TGlobalUtil construction

cms-sw · May 5, 2016 · 1737d36 · 1737d36
1 parent 2260022
commit 1737d36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc b/L1Trigger/L1TGlobal/plugins/GtRecordDump.cc
@@ -65,7 +65,9 @@ namespace l1t {
     virtual ~GtRecordDump(){};
     virtual void analyze(const edm::Event&, const edm::EventSetup&);  
     virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
-
+
+    InputTag   uGtAlgInputTag;
+    InputTag   uGtExtInputTag;
     EDGetToken egToken;
     EDGetToken muToken;
     EDGetToken tauToken;
@@ -111,13 +113,15 @@ namespace l1t {
 
   GtRecordDump::GtRecordDump(const edm::ParameterSet& iConfig)
   {
+      uGtAlgInputTag = iConfig.getParameter<InputTag>("uGtAlgInputTag");
+      uGtExtInputTag = iConfig.getParameter<InputTag>("uGtExtInputTag");
       egToken     = consumes<BXVector<l1t::EGamma>>(iConfig.getParameter<InputTag>("egInputTag"));
       muToken     = consumes<BXVector<l1t::Muon>>(iConfig.getParameter<InputTag>("muInputTag"));
       tauToken    = consumes<BXVector<l1t::Tau>>(iConfig.getParameter<InputTag>("tauInputTag"));
       jetToken    = consumes<BXVector<l1t::Jet>>(iConfig.getParameter<InputTag>("jetInputTag"));
       etsumToken  = consumes<BXVector<l1t::EtSum>>(iConfig.getParameter<InputTag>("etsumInputTag"));
-      uGtAlgToken = consumes<BXVector<GlobalAlgBlk>>(iConfig.getParameter<InputTag>("uGtAlgInputTag"));
-      uGtExtToken = consumes<BXVector<GlobalExtBlk>>(iConfig.getParameter<InputTag>("uGtExtInputTag"));
+      uGtAlgToken = consumes<BXVector<GlobalAlgBlk>>(uGtAlgInputTag);
+      uGtExtToken = consumes<BXVector<GlobalExtBlk>>(uGtExtInputTag);
 
 
       m_minBx           = iConfig.getParameter<int>("minBx");
@@ -139,7 +143,7 @@ namespace l1t {
       std::string preScaleFileName = iConfig.getParameter<std::string>("psFileName");
       unsigned int preScColumn = iConfig.getParameter<int>("psColumn");
 
-      m_gtUtil = new L1TGlobalUtil(iConfig, consumesCollector(), *this);
+      m_gtUtil = new L1TGlobalUtil(iConfig, consumesCollector(), *this, uGtAlgInputTag, uGtExtInputTag);
       m_gtUtil->OverridePrescalesAndMasks(preScaleFileName,preScColumn);
   }
 

diff --git a/L1Trigger/L1TGlobal/plugins/L1TGlobalSummary.cc b/L1Trigger/L1TGlobal/plugins/L1TGlobalSummary.cc
@@ -39,6 +39,8 @@ class L1TGlobalSummary : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
 
 private:    
+  InputTag   algInputTag_;
+  InputTag   extInputTag_;
   EDGetToken algToken_;
   EDGetToken extToken_;
   bool dumpRecord_;
@@ -55,14 +57,16 @@ class L1TGlobalSummary : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 };
 
 L1TGlobalSummary::L1TGlobalSummary(const edm::ParameterSet& iConfig){
-  algToken_ = consumes<BXVector<GlobalAlgBlk>>(iConfig.getParameter<InputTag>("AlgInputTag"));
-  extToken_ = consumes<BXVector<GlobalExtBlk>>(iConfig.getParameter<InputTag>("ExtInputTag"));
+  algInputTag_ = iConfig.getParameter<InputTag>("AlgInputTag");
+  extInputTag_ = iConfig.getParameter<InputTag>("ExtInputTag");
+  algToken_ = consumes<BXVector<GlobalAlgBlk>>(algInputTag_);
+  extToken_ = consumes<BXVector<GlobalExtBlk>>(extInputTag_);
   dumpRecord_       = iConfig.getParameter<bool>("DumpRecord");
   dumpTriggerResults_ = iConfig.getParameter<bool>("DumpTrigResults");
   dumpTriggerSummary_ = iConfig.getParameter<bool>("DumpTrigSummary");
   minBx_              = iConfig.getParameter<int>("MinBx");
   maxBx_              = iConfig.getParameter<int>("MaxBx");     
-  gtUtil_             = new L1TGlobalUtil(iConfig, consumesCollector(), *this);
+  gtUtil_             = new L1TGlobalUtil(iConfig, consumesCollector(), *this, algInputTag_, extInputTag_);
   finalOrCount = 0;
 }