Merge pull request #5492 from fwyzard/updates_for_DAQ2_testing

updates for DAQ2 testing
cms-sw · Sep 23, 2014 · 2b58495 · 2b58495
2 parents 62dbefc + 5a81fda
commit 2b58495
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/EventFilter/Utilities/plugins/RawEventFileWriterForBU.cc b/EventFilter/Utilities/plugins/RawEventFileWriterForBU.cc
@@ -272,12 +272,21 @@ void RawEventFileWriterForBU::endOfLS(int ls)
   perLumiTotalEventCount_ = 0;
 }
 
-//runs on SIGINT and terminates the process
-void RawEventFileWriterForBU::handler(int s){
+void RawEventFileWriterForBU::stop()
+{
+  // create EoR file
+  std::string path = destinationDir_ + "/" + runPrefix_ + "_ls0000_EoR.jsn";
+  runMon_->snap(0);
+  runMon_->outputFullJSON(path, 0);
+}
+
+// runs on SIGINT and terminates the process
+void RawEventFileWriterForBU::handler(int s)
+{
   printf("Caught signal %d. Writing EOR file!\n",s);
   if (destinationDir_.size() > 0)
     {
-      // CREATE EOR file
+      // create EoR file
       if (run_==-1) makeRunPrefix(destinationDir_);
       std::string path = destinationDir_ + "/" + runPrefix_ + "_ls0000_EoR.jsn";
       runMon_->snap(0);

diff --git a/EventFilter/Utilities/plugins/RawEventFileWriterForBU.h b/EventFilter/Utilities/plugins/RawEventFileWriterForBU.h
@@ -34,7 +34,7 @@ class RawEventFileWriterForBU
   uint32 adler32() const { return (adlerb_ << 16) | adlera_; }
 
   void start(){}
-  void stop() {}
+  void stop();
   void initialize(std::string const& destinationDir, std::string const& name, int ls);
   void endOfLS(int ls);
   bool sharedMode() const {return false;}

diff --git a/EventFilter/Utilities/src/EvFDaqDirector.cc b/EventFilter/Utilities/src/EvFDaqDirector.cc
@@ -213,7 +213,7 @@ namespace evf {
     close(bu_readlock_fd_);
     close(bu_writelock_fd_);
     if (directorBu_) {
-      std::string filename = base_dir_ + "/bu.lock";
+      std::string filename = bu_run_dir_ + "/bu.lock";
       removeFile(filename);
     }
   }