Merge pull request #1672 from Martin-Grunewald/HLTPrescaler

Make HLTPrescaler a stream filter with a global cache accounting
cms-sw · Dec 5, 2013 · 48bd9b5 · 48bd9b5
2 parents 5e5e80d + 93294ea
commit 48bd9b5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/HLTrigger/HLTcore/interface/HLTPrescaler.h b/HLTrigger/HLTcore/interface/HLTPrescaler.h
@@ -12,26 +12,39 @@
  *  \author Philipp Schieferdecker
  */
 
+#include <atomic>
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/PrescaleService/interface/PrescaleService.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 namespace edm {
   class ConfigurationDescriptions;
 }
 
+namespace trigger {
+  struct Efficiency {
+    Efficiency(): eventCount_(0),acceptCount_(0) { }
+    mutable std::atomic<unsigned int> eventCount_;
+    mutable std::atomic<unsigned int> acceptCount_;
+  };
+}
 
-class HLTPrescaler : public edm::EDFilter
+class HLTPrescaler : public edm::stream::EDFilter<edm::GlobalCache<trigger::Efficiency> >
 {
 public:
   //
   // construction/destruction
   //
-  explicit HLTPrescaler(edm::ParameterSet const& iConfig);
+  explicit HLTPrescaler(edm::ParameterSet const& iConfig, const trigger::Efficiency* efficiency);
   virtual ~HLTPrescaler();
 
+  static std::unique_ptr<trigger::Efficiency> initializeGlobalCache(edm::ParameterSet const&) {
+    return std::unique_ptr<trigger::Efficiency>(new trigger::Efficiency());
+  }
+
+
 
   //
   // member functions
@@ -40,7 +53,8 @@ class HLTPrescaler : public edm::EDFilter
   virtual void beginLuminosityBlock(edm::LuminosityBlock const&lb,
 				    edm::EventSetup const& iSetup) override;
   virtual bool filter(edm::Event& iEvent,edm::EventSetup const& iSetup) override;
-  virtual void endJob() override;
+  virtual void endStream() override;
+  static  void globalEndJob(const trigger::Efficiency* efficiency);
 
 
 private:

diff --git a/HLTrigger/HLTcore/plugins/HLTPrescaler.cc b/HLTrigger/HLTcore/plugins/HLTPrescaler.cc
@@ -29,7 +29,7 @@ const unsigned int HLTPrescaler::prescaleSeed_ = 65537;
 ///////////////////////////////////////////////////////////////////////////////
 
 //_____________________________________________________________________________
-HLTPrescaler::HLTPrescaler(edm::ParameterSet const& iConfig) :
+HLTPrescaler::HLTPrescaler(edm::ParameterSet const& iConfig, const trigger::Efficiency* efficiency) :
   prescaleSet_(0)
   , prescaleFactor_(1)
   , eventCount_(0)
@@ -53,7 +53,6 @@ HLTPrescaler::~HLTPrescaler()
 
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // implementation of member functions
 ////////////////////////////////////////////////////////////////////////////////
@@ -127,12 +126,27 @@ bool HLTPrescaler::filter(edm::Event& iEvent, const edm::EventSetup&)
 
 
 //_____________________________________________________________________________
-void HLTPrescaler::endJob()
+void HLTPrescaler::endStream()
 {
+  //since these are std::atomic, it is safe to increment them
+  // even if multiple endStreams are being called.
+  globalCache()->eventCount_ += eventCount_;
+  globalCache()->acceptCount_ += acceptCount_; 
+  return;
+}
+
+//_____________________________________________________________________________
+void HLTPrescaler::globalEndJob(const trigger::Efficiency* efficiency)
+{
+  unsigned int accept(efficiency->acceptCount_);
+  unsigned int event (efficiency->eventCount_);
   edm::LogInfo("PrescaleSummary")
-    << acceptCount_<< "/" <<eventCount_
+    << accept << "/" << event
     << " ("
-    << 100.*acceptCount_/static_cast<double>(std::max(1u,eventCount_))
+    << 100.*accept/static_cast<double>(std::max(1u,event))
     << "% of events accepted).";
   return;
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(HLTPrescaler);
diff --git a/HLTrigger/HLTcore/plugins/SealModule.cc b/HLTrigger/HLTcore/plugins/SealModule.cc
@@ -3,7 +3,6 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "HLTrigger/HLTcore/interface/HLTPrescaler.h"
 #include "HLTrigger/HLTcore/interface/HLTEventAnalyzerAOD.h"
 #include "HLTrigger/HLTcore/interface/HLTEventAnalyzerRAW.h"
 #include "HLTrigger/HLTcore/interface/TriggerSummaryAnalyzerAOD.h"
@@ -12,7 +11,6 @@
 #include "HLTrigger/HLTcore/interface/TriggerSummaryProducerRAW.h"
 #include "HLTrigger/HLTcore/interface/HLTPrescaleRecorder.h"
 
-DEFINE_FWK_MODULE(HLTPrescaler);
 DEFINE_FWK_MODULE(HLTEventAnalyzerAOD);
 DEFINE_FWK_MODULE(HLTEventAnalyzerRAW);
 DEFINE_FWK_MODULE(TriggerSummaryAnalyzerAOD);