ForOutput LB and Run can now be used in EvFOutputModule

cms-sw · Feb 20, 2019 · 2737247 · 2737247
1 parent 55b98e3
commit 2737247
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/EventFilter/Utilities/interface/EvFOutputModule.h b/EventFilter/Utilities/interface/EvFOutputModule.h
@@ -24,15 +24,16 @@ namespace evf {
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   private:
+    void write(edm::EventForOutput const& e) override;
+
     //pure in parent class but unused here
     void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {}
-    void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {}
     void writeRun(edm::RunForOutput const&) override {}
+    void globalEndRun(edm::RunForOutput const&) const override {}
 
-    std::shared_ptr<EvFOutputJSONWriter> globalBeginRun(edm::Run const& run, edm::EventSetup const& setup) const override;
-    std::shared_ptr<EvFOutputEventWriter> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override;
-    void write(edm::EventForOutput const& e) override;
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override;
+    std::shared_ptr<EvFOutputJSONWriter> globalBeginRun(edm::RunForOutput const& run) const override;
+    std::shared_ptr<EvFOutputEventWriter> globalBeginLuminosityBlock(edm::LuminosityBlockForOutput const& iLB) const override;
+    void globalEndLuminosityBlock(edm::LuminosityBlockForOutput const& iLB) const override;
 
     Trig getTriggerResults(edm::EDGetTokenT<edm::TriggerResults> const& token, edm::EventForOutput const& e) const;
 

diff --git a/EventFilter/Utilities/src/EvFOutputModule.cc b/EventFilter/Utilities/src/EvFOutputModule.cc
@@ -235,7 +235,7 @@ namespace evf {
 
 
   std::shared_ptr<EvFOutputJSONWriter>
-  EvFOutputModule::globalBeginRun(edm::Run const& run, edm::EventSetup const& setup) const
+  EvFOutputModule::globalBeginRun(edm::RunForOutput const& run, edm::EventSetup const& setup) const
   {
     //create run Cache holding JSON file writer and variables
     auto rc = std::make_shared<EvFOutputJSONWriter>(ps_,&keptProducts()[edm::InEvent],streamLabel_);
@@ -309,7 +309,7 @@ namespace evf {
 
 
   std::shared_ptr<EvFOutputEventWriter>
-  EvFOutputModule::globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,  edm::EventSetup const&) const
+  EvFOutputModule::globalBeginLuminosityBlock(edm::LuminosityBlockForOutput const& iLB,  edm::EventSetup const&) const
   {
     auto openDatFilePath = edm::Service<evf::EvFDaqDirector>()->getOpenDatFilePath(iLB.luminosityBlock(),streamLabel_);
     auto lumiWriter = std::make_shared<EvFOutputEventWriter>(openDatFilePath);
@@ -332,7 +332,7 @@ namespace evf {
 
 
   void
-  EvFOutputModule::globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const
+  EvFOutputModule::globalEndLuminosityBlock(edm::LuminosityBlockForOutput const& iLB) const
   {
     //edm::LogInfo("EvFOutputModule") << "end lumi";
     auto lumiWriter = luminosityBlockCache(edm::LuminosityBlockIndex::invalidLuminosityBlockIndex());