From 5736b7d4f2921ef0f24a486014944150f205236c Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Wed, 3 Nov 2021 16:12:43 +0100 Subject: [PATCH] small technical updates to HLTJetTiming{Filter,Producer} --- HLTrigger/JetMET/plugins/BuildFile.xml | 5 +++- .../JetMET/plugins/HLTJetTimingFilter.cc | 3 +++ HLTrigger/JetMET/plugins/HLTJetTimingFilter.h | 22 +++------------- .../JetMET/plugins/HLTJetTimingProducer.cc | 3 +++ .../JetMET/plugins/HLTJetTimingProducer.h | 26 +++++-------------- 5 files changed, 20 insertions(+), 39 deletions(-) diff --git a/HLTrigger/JetMET/plugins/BuildFile.xml b/HLTrigger/JetMET/plugins/BuildFile.xml index 16f33f7e7f7f9..88beb7692b2fb 100644 --- a/HLTrigger/JetMET/plugins/BuildFile.xml +++ b/HLTrigger/JetMET/plugins/BuildFile.xml @@ -1,6 +1,7 @@ + @@ -13,9 +14,11 @@ - + + + diff --git a/HLTrigger/JetMET/plugins/HLTJetTimingFilter.cc b/HLTrigger/JetMET/plugins/HLTJetTimingFilter.cc index 4c92f33ad1806..95229ddafb64d 100644 --- a/HLTrigger/JetMET/plugins/HLTJetTimingFilter.cc +++ b/HLTrigger/JetMET/plugins/HLTJetTimingFilter.cc @@ -1,4 +1,7 @@ #include "HLTJetTimingFilter.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "DataFormats/JetReco/interface/CaloJet.h" +#include "DataFormats/JetReco/interface/PFJet.h" typedef HLTJetTimingFilter HLTCaloJetTimingFilter; typedef HLTJetTimingFilter HLTPFJetTimingFilter; diff --git a/HLTrigger/JetMET/plugins/HLTJetTimingFilter.h b/HLTrigger/JetMET/plugins/HLTJetTimingFilter.h index 009eb40bb1dcb..8a0719e23a6ae 100644 --- a/HLTrigger/JetMET/plugins/HLTJetTimingFilter.h +++ b/HLTrigger/JetMET/plugins/HLTJetTimingFilter.h @@ -1,35 +1,22 @@ /** \class HLTJetTimingFilter * * \brief This makes selections on the timing and associated ecal cells - * produced by HLTJetTimingProducer + * produced by HLTJetTimingProducer * \author Matthew Citron * */ #ifndef HLTrigger_JetMET_plugins_HLTJetTimingFilter_h #define HLTrigger_JetMET_plugins_HLTJetTimingFilter_h -// system include files #include -// user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "HLTrigger/HLTcore/interface/HLTFilter.h" - #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "HLTrigger/HLTcore/interface/HLTFilter.h" #include "HLTrigger/HLTcore/interface/defaultModuleLabel.h" -namespace edm { - class ConfigurationDescriptions; -} - -// -// class declaration -// template class HLTJetTimingFilter : public HLTFilter { public: @@ -55,7 +42,6 @@ class HLTJetTimingFilter : public HLTFilter { const double minPt_; }; -//Constructor template HLTJetTimingFilter::HLTJetTimingFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig), @@ -72,7 +58,6 @@ HLTJetTimingFilter::HLTJetTimingFilter(const edm::ParameterSet& iConfig) jetCellsForTimingThresh_{iConfig.getParameter("jetCellsForTimingThresh")}, minPt_{iConfig.getParameter("minJetPt")} {} -//Filter template bool HLTJetTimingFilter::hltFilter(edm::Event& iEvent, const edm::EventSetup& iSetup, @@ -100,7 +85,6 @@ bool HLTJetTimingFilter::hltFilter(edm::Event& iEvent, return njets >= minJets_; } -// Fill descriptions template void HLTJetTimingFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; diff --git a/HLTrigger/JetMET/plugins/HLTJetTimingProducer.cc b/HLTrigger/JetMET/plugins/HLTJetTimingProducer.cc index 48fd4e9c7848c..a89a404ea1d1c 100644 --- a/HLTrigger/JetMET/plugins/HLTJetTimingProducer.cc +++ b/HLTrigger/JetMET/plugins/HLTJetTimingProducer.cc @@ -1,4 +1,7 @@ #include "HLTJetTimingProducer.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "DataFormats/JetReco/interface/CaloJet.h" +#include "DataFormats/JetReco/interface/PFJet.h" typedef HLTJetTimingProducer HLTCaloJetTimingProducer; typedef HLTJetTimingProducer HLTPFJetTimingProducer; diff --git a/HLTrigger/JetMET/plugins/HLTJetTimingProducer.h b/HLTrigger/JetMET/plugins/HLTJetTimingProducer.h index e49b0f2833c11..8d523838d7d66 100644 --- a/HLTrigger/JetMET/plugins/HLTJetTimingProducer.h +++ b/HLTrigger/JetMET/plugins/HLTJetTimingProducer.h @@ -7,31 +7,23 @@ #ifndef HLTrigger_JetMET_plugins_HLTJetTimingProducer_h #define HLTrigger_JetMET_plugins_HLTJetTimingProducer_h -// system include files #include +#include -// user include files #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/stream/EDProducer.h" - #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "DataFormats/Common/interface/ValueMap.h" - -#include "DataFormats/JetReco/interface/CaloJetCollection.h" -#include "DataFormats/JetReco/interface/PFJetCollection.h" - +#include "DataFormats/Common/interface/SortedCollection.h" +#include "DataFormats/EcalRecHit/interface/EcalRecHit.h" +#include "DataFormats/Math/interface/deltaR.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" #include "HLTrigger/HLTcore/interface/defaultModuleLabel.h" -#include "DataFormats/Math/interface/deltaR.h" -// -// class declaration -// template class HLTJetTimingProducer : public edm::stream::EDProducer<> { public: @@ -64,7 +56,6 @@ class HLTJetTimingProducer : public edm::stream::EDProducer<> { const double matchingRadius2_; }; -//Constructor template HLTJetTimingProducer::HLTJetTimingProducer(const edm::ParameterSet& iConfig) : caloGeometryToken_(esConsumes()), @@ -84,7 +75,6 @@ HLTJetTimingProducer::HLTJetTimingProducer(const edm::ParameterSet& iConfig) produces>("jetEcalEtForTiming"); } -//calculate jet time template void HLTJetTimingProducer::jetTimeFromEcalCells( const T& jet, @@ -102,7 +92,7 @@ void HLTJetTimingProducer::jetTimeFromEcalCells( continue; if (ecalRH.timeError() <= 0. || ecalRH.timeError() > ecalCellTimeErrorThresh_) continue; - if (fabs(ecalRH.time()) > ecalCellTimeThresh_) + if (std::abs(ecalRH.time()) > ecalCellTimeThresh_) continue; auto const pos = caloGeometry.getPosition(ecalRH.detid()); if (reco::deltaR2(jet, pos) > matchingRadius2_) @@ -116,7 +106,6 @@ void HLTJetTimingProducer::jetTimeFromEcalCells( } } -//Producer template void HLTJetTimingProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { auto const& caloGeometry = iSetup.getData(caloGeometryToken_); @@ -168,7 +157,6 @@ void HLTJetTimingProducer::produce(edm::Event& iEvent, const edm::EventSetup& iEvent.put(std::move(jetCellsForTiming_out), "jetCellsForTiming"); } -// Fill descriptions template void HLTJetTimingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc;