Merge pull request #47657 from smorovic/151x-fix-hilton-tests

[DAQ] fix for raw generator creating incorrect raw files in Hilton (15_1_X)

Author: cmsbuild

EventFilter/Utilities/plugins/RawEventOutputModuleForBU.h

@@ -54,7 +54,6 @@ class RawEventOutputModuleForBU : public edm::one::OutputModule<edm::one::WatchR
   std::vector<unsigned int> sourceIdList_;
   unsigned int totevents_ = 0;
   unsigned int index_ = 0;
-  bool firstLumi_ = true;
 };
 
 template <class Consumer>
@@ -184,11 +183,8 @@ void RawEventOutputModuleForBU<Consumer>::beginLuminosityBlock(edm::LuminosityBl
   std::string destinationDir = edm::Service<evf::EvFDaqDirector>()->buBaseRunDir();
   int run = edm::Service<evf::EvFDaqDirector>()->getRunNumber();
   std::cout << " writing to destination dir " << destinationDir << " name: " << filename << std::endl;
+  totevents_ = 0;
   templateConsumer_->initialize(destinationDir, filename, run, ls.id().luminosityBlock());
-  if (!firstLumi_) {
-    totevents_ = 0;
-    firstLumi_ = false;
-  }
 }
 
 template <class Consumer>