Avoid getting EventSetup data in TripletFilter

The esConsumes and get is done in the user of the class.
cms-sw · Oct 27, 2022 · 61c71b5 · 61c71b5
1 parent 3899963
commit 61c71b5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/PixelTripletLowPtGenerator.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/PixelTripletLowPtGenerator.h
@@ -27,6 +27,8 @@ class TrackerGeometry;
 class TransientTrackingRecHitBuilder;
 class TransientRecHitRecord;
 class TripletFilter;
+class ClusterShapeHitFilter;
+class CkfComponentsRecord;
 
 #include <vector>
 
@@ -56,6 +58,7 @@ class PixelTripletLowPtGenerator : public HitTripletGeneratorFromPairAndLayers {
   edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> m_magfieldToken;
   edm::ESGetToken<TransientTrackingRecHitBuilder, TransientRecHitRecord> m_ttrhBuilderToken;
   edm::ESGetToken<MultipleScatteringParametrisationMaker, TrackerMultipleScatteringRecord> m_msmakerToken;
+  edm::ESGetToken<ClusterShapeHitFilter, CkfComponentsRecord> m_clusterFilterToken;
 
   void getTracker(const edm::EventSetup& es);
   GlobalPoint getGlobalPosition(const TrackingRecHit* recHit);

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/TripletFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/TripletFilter.h
@@ -6,26 +6,23 @@
 
 #include <vector>
 
-namespace edm {
-  class EventSetup;
-}
 class TrackingRecHit;
 class ClusterShapeHitFilter;
 class TrackerTopology;
 class SiPixelClusterShapeCache;
 
 class TripletFilter {
 public:
-  TripletFilter(const edm::EventSetup& es);
-  ~TripletFilter();
+  explicit TripletFilter(const ClusterShapeHitFilter* iFilter) : theFilter(iFilter) {}
+  ~TripletFilter() = default;
   bool checkTrack(const std::vector<const TrackingRecHit*>& recHits,
                   const std::vector<LocalVector>& localDirs,
                   const TrackerTopology* tTopo,
-                  const SiPixelClusterShapeCache& clusterShapeCache);
+                  const SiPixelClusterShapeCache& clusterShapeCache) const;
   bool checkTrack(const std::vector<const TrackingRecHit*>& recHits,
                   const std::vector<GlobalVector>& globalDirs,
                   const TrackerTopology* tTopo,
-                  const SiPixelClusterShapeCache& clusterShapeCache);
+                  const SiPixelClusterShapeCache& clusterShapeCache) const;
 
 private:
   const ClusterShapeHitFilter* theFilter;

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/PixelTripletLowPtGenerator.cc
@@ -15,6 +15,7 @@
 #include "RecoTracker/TkMSParametrization/interface/MultipleScatteringParametrisationMaker.h"
 #include "TrackingTools/Records/interface/TransientRecHitRecord.h"
 #include "RecoTracker/Record/interface/TrackerMultipleScatteringRecord.h"
+#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
 
 #undef Debug
 
@@ -28,6 +29,7 @@ PixelTripletLowPtGenerator::PixelTripletLowPtGenerator(const edm::ParameterSet&
       m_magfieldToken(iC.esConsumes()),
       m_ttrhBuilderToken(iC.esConsumes(edm::ESInputTag("", cfg.getParameter<string>("TTRHBuilder")))),
       m_msmakerToken(iC.esConsumes()),
+      m_clusterFilterToken(iC.esConsumes(edm::ESInputTag("", "ClusterShapeHitFilter"))),
       theTracker(nullptr),
       theClusterShapeCacheToken(
           iC.consumes<SiPixelClusterShapeCache>(cfg.getParameter<edm::InputTag>("clusterShapeCacheSrc"))) {
@@ -51,7 +53,7 @@ void PixelTripletLowPtGenerator::getTracker(const edm::EventSetup& es) {
   }
 
   if (!theFilter) {
-    theFilter = std::make_unique<TripletFilter>(es);
+    theFilter = std::make_unique<TripletFilter>(&es.getData(m_clusterFilterToken));
   }
 }
 

diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/TripletFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/TripletFilter.cc
@@ -3,37 +3,20 @@
 #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h"
 #include "RecoPixelVertexing/PixelLowPtUtilities/interface/HitInfo.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
-#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 
-#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
 using namespace std;
 
-/*****************************************************************************/
-TripletFilter::TripletFilter(const edm::EventSetup& es) {
-  // Get cluster shape hit filter
-  edm::ESHandle<ClusterShapeHitFilter> shape;
-  es.get<CkfComponentsRecord>().get("ClusterShapeHitFilter", shape);
-  theFilter = shape.product();
-}
-
-/*****************************************************************************/
-TripletFilter::~TripletFilter() {}
-
 /*****************************************************************************/
 bool TripletFilter::checkTrack(const vector<const TrackingRecHit*>& recHits,
                                const vector<LocalVector>& localDirs,
                                const TrackerTopology* tTopo,
-                               const SiPixelClusterShapeCache& clusterShapeCache) {
+                               const SiPixelClusterShapeCache& clusterShapeCache) const {
   bool ok = true;
 
   vector<LocalVector>::const_iterator localDir = localDirs.begin();
@@ -62,7 +45,7 @@ bool TripletFilter::checkTrack(const vector<const TrackingRecHit*>& recHits,
 bool TripletFilter::checkTrack(const vector<const TrackingRecHit*>& recHits,
                                const vector<GlobalVector>& globalDirs,
                                const TrackerTopology* tTopo,
-                               const SiPixelClusterShapeCache& clusterShapeCache) {
+                               const SiPixelClusterShapeCache& clusterShapeCache) const {
   bool ok = true;
 
   vector<GlobalVector>::const_iterator globalDir = globalDirs.begin();