Merge pull request #35080 from Dr15Jones/esConsumesDTTrackFinder

Added missing esConsumes to DTTrackFinder

L1Trigger/DTTrackFinder/src/L1MuDTAssignmentUnit.cc

@@ -54,8 +54,16 @@ using namespace std;
 // Constructors --
 //----------------
 
-L1MuDTAssignmentUnit::L1MuDTAssignmentUnit(L1MuDTSectorProcessor& sp, int id)
-    : m_sp(sp), m_id(id), m_addArray(), m_TSphi(), m_ptAssMethod(NODEF), nbit_phi(12), nbit_phib(10) {
+L1MuDTAssignmentUnit::L1MuDTAssignmentUnit(L1MuDTSectorProcessor& sp, int id, edm::ConsumesCollector iC)
+    : m_sp(sp),
+      m_id(id),
+      m_addArray(),
+      m_TSphi(),
+      m_ptAssMethod(NODEF),
+      thePhiToken(iC.esConsumes()),
+      thePtaToken(iC.esConsumes()),
+      nbit_phi(12),
+      nbit_phib(10) {
   m_TSphi.reserve(4);  // a track candidate can consist of max 4 TS
   reset();
 
@@ -133,7 +141,7 @@ void L1MuDTAssignmentUnit::reset() {
 void L1MuDTAssignmentUnit::PhiAU(const edm::EventSetup& c) {
   // calculate phi at station 2 using 8 bits (precision = 2.5 degrees)
 
-  c.get<L1MuDTPhiLutRcd>().get(thePhiLUTs);
+  thePhiLUTs = c.getHandle(thePhiToken);
 
   int sh_phi = 12 - m_sp.tf().config()->getNbitsPhiPhi();
   int sh_phib = 10 - m_sp.tf().config()->getNbitsPhiPhib();
@@ -203,7 +211,7 @@ void L1MuDTAssignmentUnit::PhiAU(const edm::EventSetup& c) {
 // assign pt with 5 bit precision
 //
 void L1MuDTAssignmentUnit::PtAU(const edm::EventSetup& c) {
-  c.get<L1MuDTPtaLutRcd>().get(thePtaLUTs);
+  thePtaLUTs = c.getHandle(thePtaToken);
 
   // get pt-assignment method as function of track class and TS phib values
   m_ptAssMethod = getPtMethod();

L1Trigger/DTTrackFinder/src/L1MuDTAssignmentUnit.h

@@ -29,37 +29,40 @@
 // Base Class Headers --
 //----------------------
 
-#include "L1Trigger/DTTrackFinder/interface/L1AbstractProcessor.h"
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
 
-#include <FWCore/Framework/interface/ESHandle.h>
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "CondFormats/L1TObjects/interface/L1MuDTAssParam.h"
 #include "L1Trigger/DTTrackFinder/interface/L1MuDTAddressArray.h"
 class L1MuDTPhiLut;
 class L1MuDTPtaLut;
+class L1MuDTPhiLutRcd;
+class L1MuDTPtaLutRcd;
 class L1MuDTTrackSegPhi;
 class L1MuDTSectorProcessor;
 
 //              ---------------------
 //              -- Class Interface --
 //              ---------------------
 
-class L1MuDTAssignmentUnit : public L1AbstractProcessor {
+class L1MuDTAssignmentUnit {
 public:
   /// constructor
-  L1MuDTAssignmentUnit(L1MuDTSectorProcessor& sp, int id);
+  L1MuDTAssignmentUnit(L1MuDTSectorProcessor& sp, int id, edm::ConsumesCollector);
 
   /// destructor
-  ~L1MuDTAssignmentUnit() override;
+  ~L1MuDTAssignmentUnit();
 
   /// run Assignment Unit
-  void run(const edm::EventSetup& c) override;
+  void run(const edm::EventSetup& c);
 
   /// reset Assignment Unit
-  void reset() override;
+  void reset();
 
   /// assign phi
   void PhiAU(const edm::EventSetup& c);
@@ -103,6 +106,8 @@ class L1MuDTAssignmentUnit : public L1AbstractProcessor {
   std::vector<const L1MuDTTrackSegPhi*> m_TSphi;
   PtAssMethod m_ptAssMethod;
 
+  edm::ESGetToken<L1MuDTPhiLut, L1MuDTPhiLutRcd> thePhiToken;
+  edm::ESGetToken<L1MuDTPtaLut, L1MuDTPtaLutRcd> thePtaToken;
   edm::ESHandle<L1MuDTPhiLut> thePhiLUTs;  ///< phi-assignment look-up tables
   edm::ESHandle<L1MuDTPtaLut> thePtaLUTs;  ///< pt-assignment look-up tables
   unsigned short nbit_phi;                 ///< # of bits used for pt-assignment

L1Trigger/DTTrackFinder/src/L1MuDTERS.h

@@ -27,8 +27,6 @@
 // Base Class Headers --
 //----------------------
 
-#include "L1Trigger/DTTrackFinder/interface/L1AbstractProcessor.h"
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
@@ -40,19 +38,19 @@ class L1MuDTSEU;
 //              -- Class Interface --
 //              ---------------------
 
-class L1MuDTERS : public L1AbstractProcessor {
+class L1MuDTERS {
 public:
   /// constructor
   L1MuDTERS(const L1MuDTSEU&);
 
   /// destructor
-  ~L1MuDTERS() override;
+  ~L1MuDTERS();
 
   /// run L1MuDTERS
-  void run() override;
+  void run();
 
   /// reset ERS
-  void reset() override;
+  void reset();
 
   /// return extrapolation quality
   inline unsigned int quality(int id) const { return m_quality[id]; }

L1Trigger/DTTrackFinder/src/L1MuDTEUX.h

@@ -28,13 +28,12 @@
 // Base Class Headers --
 //----------------------
 
-#include "L1Trigger/DTTrackFinder/interface/L1AbstractProcessor.h"
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
 
-#include <FWCore/Framework/interface/ESHandle.h>
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 class L1MuDTTrackSegPhi;
 class L1MuDTSectorProcessor;
 class L1MuDTSEU;
@@ -45,22 +44,22 @@ class L1MuDTTFParameters;
 //              -- Class Interface --
 //              ---------------------
 
-class L1MuDTEUX : public L1AbstractProcessor {
+class L1MuDTEUX {
 public:
   /// constructor
   L1MuDTEUX(const L1MuDTSectorProcessor& sp, const L1MuDTSEU& seu, int id);
 
   /// destructor
-  ~L1MuDTEUX() override;
+  ~L1MuDTEUX();
 
   /// equal operator
   bool operator==(const L1MuDTEUX&) const;
 
   /// run Extrapolator
-  void run(const edm::EventSetup& c) override;
+  void run(const edm::EventSetup& c);
 
   /// reset Extrapolator
-  void reset() override;
+  void reset();
 
   /// load data into EUX
   void load(const L1MuDTTrackSegPhi* start_ts, const L1MuDTTrackSegPhi* target_ts);

L1Trigger/DTTrackFinder/src/L1MuDTEtaProcessor.cc

@@ -65,7 +65,10 @@ L1MuDTEtaProcessor::L1MuDTEtaProcessor(const L1MuDTTrackFinder& tf, int id, edm:
       m_epid(id),
       m_foundPattern(0),
       m_tseta(15),
-      m_DTDigiToken(iC.consumes<L1MuDTChambThContainer>(m_tf.config()->getDTDigiInputTag())) {
+      m_DTDigiToken(iC.consumes<L1MuDTChambThContainer>(m_tf.config()->getDTDigiInputTag())),
+      theEtaToken(iC.esConsumes()),
+      theQualToken(iC.esConsumes()),
+      theMsksToken(iC.esConsumes()) {
   m_tseta.reserve(15);
 }
 
@@ -208,7 +211,7 @@ void L1MuDTEtaProcessor::print() const {
 // receive data ( 15*3 DTBX eta trigger primitives )
 //
 void L1MuDTEtaProcessor::receiveData(int bx, const edm::Event& e, const edm::EventSetup& c) {
-  c.get<L1MuDTTFMasksRcd>().get(msks);
+  msks = c.getHandle(theMsksToken);
 
   edm::Handle<L1MuDTChambThContainer> dttrig;
   e.getByToken(m_DTDigiToken, dttrig);
@@ -301,7 +304,7 @@ void L1MuDTEtaProcessor::receiveAddresses() {
 // run Eta Track Finder (ETF)
 //
 void L1MuDTEtaProcessor::runEtaTrackFinder(const edm::EventSetup& c) {
-  c.get<L1MuDTEtaPatternLutRcd>().get(theEtaPatternLUT);
+  theEtaPatternLUT = c.getHandle(theEtaToken);
 
   // check if there are any data
   bool empty = true;
@@ -347,7 +350,7 @@ void L1MuDTEtaProcessor::runEtaTrackFinder(const edm::EventSetup& c) {
 // run Eta Matching Unit (EMU)
 //
 void L1MuDTEtaProcessor::runEtaMatchingUnit(const edm::EventSetup& c) {
-  c.get<L1MuDTQualPatternLutRcd>().get(theQualPatternLUT);
+  theQualPatternLUT = c.getHandle(theQualToken);
 
   // loop over all addresses
   for (int i = 0; i < 12; i++) {

L1Trigger/DTTrackFinder/src/L1MuDTEtaProcessor.h

@@ -38,6 +38,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "L1Trigger/DTTrackFinder/interface/L1MuDTAddressArray.h"
 class L1MuDTChambThContainer;
@@ -47,7 +48,9 @@ class L1MuDTTrack;
 class L1MuDTEtaPatternLut;
 class L1MuDTQualPatternLut;
 class L1MuDTTFMasks;
-
+class L1MuDTTFMasksRcd;
+class L1MuDTEtaPatternLutRcd;
+class L1MuDTQualPatternLutRcd;
 //              ---------------------
 //              -- Class Interface --
 //              ---------------------
@@ -118,6 +121,9 @@ class L1MuDTEtaProcessor {
   std::vector<const L1MuDTTrackSegEta*> m_tseta;
   edm::EDGetTokenT<L1MuDTChambThContainer> m_DTDigiToken;
 
+  edm::ESGetToken<L1MuDTEtaPatternLut, L1MuDTEtaPatternLutRcd> theEtaToken;
+  edm::ESGetToken<L1MuDTQualPatternLut, L1MuDTQualPatternLutRcd> theQualToken;
+  edm::ESGetToken<L1MuDTTFMasks, L1MuDTTFMasksRcd> theMsksToken;
   edm::ESHandle<L1MuDTEtaPatternLut> theEtaPatternLUT;    // ETF look-up table
   edm::ESHandle<L1MuDTQualPatternLut> theQualPatternLUT;  // EMU look-up tables
   edm::ESHandle<L1MuDTTFMasks> msks;

L1Trigger/DTTrackFinder/src/L1MuDTExtrapolationUnit.cc

@@ -52,7 +52,8 @@ using namespace std;
 // Constructors --
 //----------------
 
-L1MuDTExtrapolationUnit::L1MuDTExtrapolationUnit(const L1MuDTSectorProcessor& sp) : m_sp(sp), m_SEUs() {
+L1MuDTExtrapolationUnit::L1MuDTExtrapolationUnit(const L1MuDTSectorProcessor& sp, edm::ConsumesCollector iC)
+    : m_sp(sp), m_SEUs(), m_parsToken(iC.esConsumes()) {
   for (int ext_idx = 0; ext_idx < MAX_EXT; ext_idx++) {
     Extrapolation ext = static_cast<Extrapolation>(ext_idx);
 
@@ -92,7 +93,7 @@ L1MuDTExtrapolationUnit::~L1MuDTExtrapolationUnit() {
 // run Extrapolation Unit
 //
 void L1MuDTExtrapolationUnit::run(const edm::EventSetup& c) {
-  c.get<L1MuDTTFParametersRcd>().get(pars);
+  pars = c.getHandle(m_parsToken);
 
   SEUmap::const_iterator iter;
   for (iter = m_SEUs.begin(); iter != m_SEUs.end(); iter++) {

L1Trigger/DTTrackFinder/src/L1MuDTExtrapolationUnit.h

@@ -33,38 +33,39 @@
 // Base Class Headers --
 //----------------------
 
-#include "L1Trigger/DTTrackFinder/interface/L1AbstractProcessor.h"
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
 
 #include "CondFormats/L1TObjects/interface/L1MuDTExtParam.h"
-#include <FWCore/Framework/interface/ESHandle.h>
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 class L1MuDTSectorProcessor;
 class L1MuDTSEU;
 class L1MuDTTFParameters;
+class L1MuDTTFParametersRcd;
 
 //              ---------------------
 //              -- Class Interface --
 //              ---------------------
 
-class L1MuDTExtrapolationUnit : public L1AbstractProcessor {
+class L1MuDTExtrapolationUnit {
 public:
   typedef std::pair<Extrapolation, unsigned int> SEUId;
   typedef std::map<SEUId, L1MuDTSEU*, std::less<SEUId> > SEUmap;
 
   /// constructor
-  L1MuDTExtrapolationUnit(const L1MuDTSectorProcessor&);
+  L1MuDTExtrapolationUnit(const L1MuDTSectorProcessor&, edm::ConsumesCollector);
 
   /// destructor
-  ~L1MuDTExtrapolationUnit() override;
+  ~L1MuDTExtrapolationUnit();
 
   /// run Extrapolation Unit
-  void run(const edm::EventSetup& c) override;
+  void run(const edm::EventSetup& c);
 
   /// reset Extrapolation Unit
-  void reset() override;
+  void reset();
 
   /// reset a single extrapolation
   void reset(Extrapolation ext, unsigned int startAdr, unsigned int relAdr);
@@ -95,6 +96,7 @@ class L1MuDTExtrapolationUnit : public L1AbstractProcessor {
 
   mutable SEUmap m_SEUs;  // Single Extrapolation Units
 
+  edm::ESGetToken<L1MuDTTFParameters, L1MuDTTFParametersRcd> m_parsToken;
   edm::ESHandle<L1MuDTTFParameters> pars;
 };
 

L1Trigger/DTTrackFinder/src/L1MuDTMuonSorter.h

@@ -28,8 +28,6 @@
 // Base Class Headers --
 //----------------------
 
-#include "L1Trigger/DTTrackFinder/interface/L1AbstractProcessor.h"
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
@@ -42,19 +40,19 @@ class L1MuDTSecProcId;
 //              -- Class Interface --
 //              ---------------------
 
-class L1MuDTMuonSorter : public L1AbstractProcessor {
+class L1MuDTMuonSorter {
 public:
   /// constructor
   L1MuDTMuonSorter(const L1MuDTTrackFinder&);
 
   /// destructor
-  ~L1MuDTMuonSorter() override;
+  ~L1MuDTMuonSorter();
 
   /// run Muon Sorter
-  void run() override;
+  void run();
 
   /// reset Muon Sorter
-  void reset() override;
+  void reset();
 
   /// print results after sorting
   void print() const;