Skip to content

small technical updates to HLTJetTiming{Filter,Producer} #35971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Nov 4, 2021
Merged

small technical updates to HLTJetTiming{Filter,Producer} #35971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion HLTrigger/JetMET/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<library file="*.cc" name="HLTriggerJetMETPlugins">
<use name="CommonTools/Utils"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/EcalRecHit"/>
<use name="DataFormats/HLTReco"/>
<use name="DataFormats/JetReco"/>
<use name="DataFormats/Math"/>
Expand All @@ -13,9 +14,11 @@
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/Utilities"/>
<use name="HLTrigger/HLTcore"/>
<use name="Geometry/CaloGeometry"/>
<use name="Geometry/Records"/>
<use name="TrackingTools/IPTools"/>
<use name="TrackingTools/TransientTrack"/>
<use name="HLTrigger/HLTcore"/>
<use name="HLTrigger/JetMET"/>
<flags EDM_PLUGIN="1"/>
</library>
3 changes: 3 additions & 0 deletions HLTrigger/JetMET/plugins/HLTJetTimingFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<reco::CaloJet> HLTCaloJetTimingFilter;
typedef HLTJetTimingFilter<reco::PFJet> HLTPFJetTimingFilter;
Expand Down
22 changes: 3 additions & 19 deletions HLTrigger/JetMET/plugins/HLTJetTimingFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <memory>

// 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 <typename T>
class HLTJetTimingFilter : public HLTFilter {
public:
Expand All @@ -55,7 +42,6 @@ class HLTJetTimingFilter : public HLTFilter {
const double minPt_;
};

//Constructor
template <typename T>
HLTJetTimingFilter<T>::HLTJetTimingFilter(const edm::ParameterSet& iConfig)
: HLTFilter(iConfig),
Expand All @@ -72,7 +58,6 @@ HLTJetTimingFilter<T>::HLTJetTimingFilter(const edm::ParameterSet& iConfig)
jetCellsForTimingThresh_{iConfig.getParameter<unsigned int>("jetCellsForTimingThresh")},
minPt_{iConfig.getParameter<double>("minJetPt")} {}

//Filter
template <typename T>
bool HLTJetTimingFilter<T>::hltFilter(edm::Event& iEvent,
const edm::EventSetup& iSetup,
Expand Down Expand Up @@ -100,7 +85,6 @@ bool HLTJetTimingFilter<T>::hltFilter(edm::Event& iEvent,
return njets >= minJets_;
}

// Fill descriptions
template <typename T>
void HLTJetTimingFilter<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
Expand Down
3 changes: 3 additions & 0 deletions HLTrigger/JetMET/plugins/HLTJetTimingProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<reco::CaloJet> HLTCaloJetTimingProducer;
typedef HLTJetTimingProducer<reco::PFJet> HLTPFJetTimingProducer;
Expand Down
26 changes: 7 additions & 19 deletions HLTrigger/JetMET/plugins/HLTJetTimingProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,23 @@
#ifndef HLTrigger_JetMET_plugins_HLTJetTimingProducer_h
#define HLTrigger_JetMET_plugins_HLTJetTimingProducer_h

// system include files
#include <memory>
#include <cmath>

// 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 <typename T>
class HLTJetTimingProducer : public edm::stream::EDProducer<> {
public:
Expand Down Expand Up @@ -64,7 +56,6 @@ class HLTJetTimingProducer : public edm::stream::EDProducer<> {
const double matchingRadius2_;
};

//Constructor
template <typename T>
HLTJetTimingProducer<T>::HLTJetTimingProducer(const edm::ParameterSet& iConfig)
: caloGeometryToken_(esConsumes()),
Expand All @@ -84,7 +75,6 @@ HLTJetTimingProducer<T>::HLTJetTimingProducer(const edm::ParameterSet& iConfig)
produces<edm::ValueMap<float>>("jetEcalEtForTiming");
}

//calculate jet time
template <typename T>
void HLTJetTimingProducer<T>::jetTimeFromEcalCells(
const T& jet,
Expand All @@ -102,7 +92,7 @@ void HLTJetTimingProducer<T>::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_)
Expand All @@ -116,7 +106,6 @@ void HLTJetTimingProducer<T>::jetTimeFromEcalCells(
}
}

//Producer
template <typename T>
void HLTJetTimingProducer<T>::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
auto const& caloGeometry = iSetup.getData(caloGeometryToken_);
Expand Down Expand Up @@ -168,7 +157,6 @@ void HLTJetTimingProducer<T>::produce(edm::Event& iEvent, const edm::EventSetup&
iEvent.put(std::move(jetCellsForTiming_out), "jetCellsForTiming");
}

// Fill descriptions
template <typename T>
void HLTJetTimingProducer<T>::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
Expand Down