[HLT eff] update efficiency calculation

Author: tihsu99

HLTriggerOffline/Scouting/plugins/PatElectronTagProbeAnalyzer.cc

@@ -171,7 +171,6 @@ class PatElectronTagProbeAnalyzer : public DQMGlobalEDAnalyzer<kTagProbeHistos>
   edm::EDGetToken algToken_;
   std::shared_ptr<l1t::L1TGlobalUtil> l1GtUtils_;
   std::vector<std::string> l1Seeds_;
-  edm::EDGetTokenT<BXVector<l1t::EGamma>> l1EGToken_;
 
   const edm::EDGetToken triggerResultsToken_;
   const edm::EDGetTokenT<pat::TriggerObjectStandAloneCollection> triggerObjects_;
@@ -190,7 +189,6 @@ PatElectronTagProbeAnalyzer::PatElectronTagProbeAnalyzer(const edm::ParameterSet
       l1filterToMatch_{iConfig.getParameter<std::vector<std::string>>("l1filterSelection")},
       l1filterIndex_{iConfig.getParameter<std::vector<unsigned int>>("l1filterSelectionIndex")},
       algToken_{consumes<BXVector<GlobalAlgBlk>>(iConfig.getParameter<edm::InputTag>("AlgInputTag"))},
-      l1EGToken_{consumes<BXVector<l1t::EGamma>>(iConfig.getParameter<edm::InputTag>("L1ElectronCollection"))},
       triggerResultsToken_(
           consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("TriggerResultTag"))),
       triggerObjects_(
@@ -225,10 +223,6 @@ void PatElectronTagProbeAnalyzer::dqmAnalyze(edm::Event const& iEvent,
     return;
   }
 
-
-  edm::Handle<BXVector<l1t::EGamma>> l1EGammaCollection; // TODO
-  iEvent.getByToken(l1EGToken_, l1EGammaCollection);  // TODO
-
   // Load pat Electron ID.
   edm::Handle<edm::ValueMap<bool>> tight_ele_id_decisions;
   iEvent.getByToken(eleIdMapTightToken_, tight_ele_id_decisions);
@@ -991,7 +985,6 @@ void PatElectronTagProbeAnalyzer::fillDescriptions(edm::ConfigurationDescription
   desc.add<std::vector<std::string>>("l1filterSelection", {});
   desc.add<std::vector<unsigned int>>("l1filterSelectionIndex", {});
   desc.add<edm::InputTag>("AlgInputTag", edm::InputTag("gtStage2Digis"));
-  desc.add<edm::InputTag>("L1ElectronCollection", edm::InputTag("gtStage2Digis", "EGamma"));
   desc.add<std::vector<std::string>>("L1Seeds", {});
   desc.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
   desc.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));

HLTriggerOffline/Scouting/plugins/ScoutingElectronTagProbeAnalyzer.cc

@@ -233,7 +233,7 @@ void ScoutingElectronTagProbeAnalyzer::dqmAnalyze(edm::Event const& iEvent,
     int second_sct_pt_order = -1;
     for (size_t second_sct_local_index=0; second_sct_local_index < indexed_sctElectrons.size(); second_sct_local_index++) {
       const auto sct_el_second = indexed_sctElectrons[second_sct_local_index].second;
-      second_sct_pt_order += 1;
+      if (scoutingDQMUtils::scoutingElectronID(sct_el_second)) second_sct_pt_order += 1; // Only use scouting electron passing ID in HLT eff calculation.
       if (&sct_el_second == &sct_el)
         continue;
       math::PtEtaPhiMLorentzVector probe_sct_el(
@@ -326,7 +326,7 @@ void ScoutingElectronTagProbeAnalyzer::fillHistograms_resonance(
         }
       }
       else if (pt_order == 1){
-        histos.subleading_electron.hPt_Endcap_passBaseDST->Fill(el.pt());
+        histos.subleading_electron.hPt_Barrel_passBaseDST->Fill(el.pt());
         histos.subleading_electron.hEta_passBaseDST->Fill(el.eta());
         for(unsigned int iTrig = 0; iTrig < vtriggerSelection_.size(); iTrig++){
             if(scoutingElectron_passHLT(el, legObjectsCollection[iTrig])){

HLTriggerOffline/Scouting/python/PatElectronTagProbeAnalyzer_cfi.py

@@ -48,7 +48,6 @@
     AlgInputTag        = cms.InputTag("gtStage2Digis"),
     l1tAlgBlkInputTag  = cms.InputTag("gtStage2Digis"),
     l1tExtBlkInputTag  = cms.InputTag("gtStage2Digis"),
-    L1ElectronCollection = cms.InputTag("gtStage2Digis", "EGamma"),
     L1Seeds            = cms.vstring(DoubleEGL1 + SinglePhotonL1),
     ReadPrescalesFromFile = cms.bool(False),
     TriggerResultTag   = cms.InputTag("TriggerResults", "", "HLT"),