From aee5ef297db1fdd7d69de191c9445bb731c6cc02 Mon Sep 17 00:00:00 2001 From: Mariana Date: Wed, 18 Aug 2021 17:32:48 +0200 Subject: [PATCH] removed unused code; removed auxiliary variable fltr --- HLTrigger/special/plugins/HLTPPSCalFilter.cc | 75 +++----------------- 1 file changed, 8 insertions(+), 67 deletions(-) diff --git a/HLTrigger/special/plugins/HLTPPSCalFilter.cc b/HLTrigger/special/plugins/HLTPPSCalFilter.cc index 683f282778756..aa0d3038c4d1c 100644 --- a/HLTrigger/special/plugins/HLTPPSCalFilter.cc +++ b/HLTrigger/special/plugins/HLTPPSCalFilter.cc @@ -25,9 +25,7 @@ #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" -#include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h" // pixel -#include "DataFormats/CTPPSReco/interface/TotemRPLocalTrack.h" // strip -#include "DataFormats/CTPPSReco/interface/CTPPSDiamondLocalTrack.h" // diamond +#include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h" // pixel #include @@ -43,12 +41,6 @@ class HLTPPSCalFilter : public edm::global::EDFilter<> { edm::InputTag pixelLocalTrackInputTag_; // Input tag identifying the pixel detector edm::EDGetTokenT> pixelLocalTrackToken_; - edm::InputTag stripLocalTrackInputTag_; // Input tag identifying the strip detector - edm::EDGetTokenT> stripLocalTrackToken_; - - edm::InputTag diamondLocalTrackInputTag_; // Input tag identifying the diamond detector - edm::EDGetTokenT> diamondLocalTrackToken_; - int minTracks_; int maxTracks_; @@ -60,10 +52,6 @@ void HLTPPSCalFilter::fillDescriptions(edm::ConfigurationDescriptions& descripti desc.add("pixelLocalTrackInputTag", edm::InputTag("ctppsPixelLocalTracks")) ->setComment("input tag of the pixel local track collection"); - desc.add("stripLocalTrackInputTag", edm::InputTag("totemRPLocalTrackFitter")) - ->setComment("input tag of the strip local track collection"); - desc.add("diamondLocalTrackInputTag", edm::InputTag("ctppsDiamondLocalTracks")) - ->setComment("input tag of the diamond local track collection"); desc.add("minTracks", 1)->setComment("minimum number of tracks in pot"); desc.add("maxTracks", -1)->setComment("maximum number of tracks in pot"); @@ -79,12 +67,6 @@ HLTPPSCalFilter::HLTPPSCalFilter(const edm::ParameterSet& iConfig) : pixelLocalTrackInputTag_(iConfig.getParameter("pixelLocalTrackInputTag")), pixelLocalTrackToken_(consumes>(pixelLocalTrackInputTag_)), - stripLocalTrackInputTag_(iConfig.getParameter("stripLocalTrackInputTag")), - stripLocalTrackToken_(consumes>(stripLocalTrackInputTag_)), - - diamondLocalTrackInputTag_(iConfig.getParameter("diamondLocalTrackInputTag")), - diamondLocalTrackToken_(consumes>(diamondLocalTrackInputTag_)), - minTracks_(iConfig.getParameter("minTracks")), maxTracks_(iConfig.getParameter("maxTracks")), @@ -96,8 +78,6 @@ bool HLTPPSCalFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Event // maps for assigning filter pass / fail std::unordered_map pixel_filter_; - std::unordered_map strip_filter_; - std::unordered_map diam_filter_; // pixel map definition pixel_filter_[CTPPSPixelDetId(0, 0, 3)] = false; @@ -105,10 +85,7 @@ bool HLTPPSCalFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Event pixel_filter_[CTPPSPixelDetId(1, 0, 3)] = false; pixel_filter_[CTPPSPixelDetId(1, 2, 3)] = false; - // strip map definition - // diamond map definition - - // First filter on pixels (2017+) selection + // filter on pixels (2017+) selection if (!pixel_filter_.empty()) { edm::Handle> pixelTracks; iEvent.getByToken(pixelLocalTrackToken_, pixelTracks); @@ -117,14 +94,16 @@ bool HLTPPSCalFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Event if (pixel_filter_.count(rpv.id) == 0) { continue; } - auto& fltr = pixel_filter_.at(rpv.id); - fltr = true; + // assume pass condition if there is at least one track + pixel_filter_.at(rpv.id) = true; + // count number of valid tracks const auto ntrks = std::count_if(rpv.begin(), rpv.end(), valid_trks); + // fail condition if ntrks not within minTracks, maxTracks values if (minTracks_ > 0 && ntrks < minTracks_) - fltr = false; + pixel_filter_.at(rpv.id) = false; if (maxTracks_ > 0 && ntrks > maxTracks_) - fltr = false; + pixel_filter_.at(rpv.id) = false; } // compilation of filter conditions @@ -137,44 +116,6 @@ bool HLTPPSCalFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::Event } } - // Then filter on strips (2016-17) selection - if (!strip_filter_.empty()) { - edm::Handle> stripTracks; - iEvent.getByToken(stripLocalTrackToken_, stripTracks); - - for (const auto& rpv : *stripTracks) { - if (strip_filter_.count(rpv.id) == 0) - continue; - auto& fltr = strip_filter_.at(rpv.id); - fltr = true; - - const auto ntrks = std::count_if(rpv.begin(), rpv.end(), valid_trks); - if (minTracks_ > 0 && ntrks < minTracks_) - fltr = false; - if (maxTracks_ > 0 && ntrks > maxTracks_) - fltr = false; - } - } - - // Finally filter on diamond (2016+) selection - if (!diam_filter_.empty()) { - edm::Handle> diamondTracks; - iEvent.getByToken(diamondLocalTrackToken_, diamondTracks); - - for (const auto& rpv : *diamondTracks) { - if (diam_filter_.count(rpv.id) == 0) - continue; - auto& fltr = diam_filter_.at(rpv.id); - fltr = true; - - const auto ntrks = std::count_if(rpv.begin(), rpv.end(), valid_trks); - if (minTracks_ > 0 && ntrks < minTracks_) - fltr = false; - if (maxTracks_ > 0 && ntrks > maxTracks_) - fltr = false; - } - } - return false; }