Make L1Filter thread friendly

Converted to global::EDFilter

Author: Dr15Jones

L1Trigger/Skimmer/src/L1Filter.cc

@@ -1,6 +1,6 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/global/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -20,70 +20,69 @@
 #include <iostream>
 #include <string>
 
-class L1Filter : public edm::EDFilter {
+class L1Filter : public edm::global::EDFilter<> {
 public:
   explicit L1Filter(edm::ParameterSet const &);
 
-  ~L1Filter() override;
-
-  bool filter(edm::Event &e, edm::EventSetup const &c) override;
-  void endJob() override;
+  bool filter(edm::StreamID, edm::Event &e, edm::EventSetup const &c) const override;
 
 private:
-  edm::InputTag inputTag_;
-  bool useAODRecord_;
-  bool useFinalDecision_;
-  std::vector<std::string> algos_;
+  edm::EDGetTokenT<L1GlobalTriggerRecord> triggerToken_;
+  edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> triggerReadoutToken_;
+  const edm::ESGetToken<L1GtTriggerMenu, L1GtTriggerMenuRcd> menuToken_;
+  const bool useAODRecord_;
+  const bool useFinalDecision_;
+  const std::vector<std::string> algos_;
 };
 
 L1Filter::L1Filter(const edm::ParameterSet &ps)
-    : inputTag_(ps.getParameter<edm::InputTag>("inputTag")),
+    : menuToken_(esConsumes()),
       useAODRecord_(ps.getParameter<bool>("useAODRecord")),
       useFinalDecision_(ps.getParameter<bool>("useFinalDecision")),
-      algos_(ps.getParameter<std::vector<std::string>>("algorithms")) {}
+      algos_(ps.getParameter<std::vector<std::string>>("algorithms")) {
+  auto inputTag = ps.getParameter<edm::InputTag>("inputTag");
 
-L1Filter::~L1Filter() {}
+  if (useAODRecord_) {
+    triggerToken_ = consumes(inputTag);
+  } else {
+    triggerReadoutToken_ = consumes(inputTag);
+  }
+}
 
-bool L1Filter::filter(edm::Event &iEvent, edm::EventSetup const &evSetup) {
+bool L1Filter::filter(edm::StreamID, edm::Event &iEvent, edm::EventSetup const &evSetup) const {
   // get menu
-  edm::ESHandle<L1GtTriggerMenu> menuRcd;
-  evSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
-  const L1GtTriggerMenu *menu = menuRcd.product();
+  const L1GtTriggerMenu &menu = evSetup.getData(menuToken_);
 
   bool passed = false;
   std::vector<std::string>::const_iterator algo;
 
   if (useAODRecord_) {
-    edm::Handle<L1GlobalTriggerRecord> gtRecord;
-    iEvent.getByLabel(inputTag_, gtRecord);
-    const DecisionWord dWord = gtRecord->decisionWord();
+    L1GlobalTriggerRecord const &gtRecord = iEvent.get(triggerToken_);
 
     if (useFinalDecision_)
-      passed = gtRecord->decision();
+      passed = gtRecord.decision();
     else {
+      const DecisionWord dWord = gtRecord.decisionWord();
       for (algo = algos_.begin(); algo != algos_.end(); ++algo) {
-        passed |= menu->gtAlgorithmResult((*algo), dWord);
+        passed |= menu.gtAlgorithmResult((*algo), dWord);
       }
     }
   } else {
-    edm::Handle<L1GlobalTriggerReadoutRecord> gtRecord;
-    iEvent.getByLabel(inputTag_, gtRecord);
-    const DecisionWord dWord = gtRecord->decisionWord();
+    L1GlobalTriggerReadoutRecord const &gtRecord = iEvent.get(triggerReadoutToken_);
 
     if (useFinalDecision_)
-      passed = gtRecord->decision();
+      passed = gtRecord.decision();
     else {
+      const DecisionWord &dWord = gtRecord.decisionWord();
       for (algo = algos_.begin(); algo != algos_.end(); ++algo) {
-        passed |= menu->gtAlgorithmResult((*algo), dWord);
+        passed |= menu.gtAlgorithmResult((*algo), dWord);
       }
     }
   }
 
   return passed;
 }
 
-void L1Filter::endJob() {}
-
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 DEFINE_FWK_MODULE(L1Filter);