Refactor string formatters, move member string to function scope

src/OutputFileHandler.cc

@@ -111,11 +111,12 @@ void OutputFileHandler::create_output_directory_maybe(std::string& output_direct
 }
 
 void OutputFileHandler::open_new_file() {
+  std::string working_files_base_path = run_dir_ + "/" + working_dir_;
   // Create a new file
   uint32_t ls = 1 + static_cast<uint32_t>(current_index_ / (max_index_per_ls_ + 1));
-  create_output_directory_maybe(working_files_base_path_);
+  create_output_directory_maybe(working_files_base_path);
   std::string filename = format_filename(current_run_number_, current_index_, ls);
-  std::string full_filename = working_files_base_path_ + "/" + filename;
+  std::string full_filename = working_files_base_path + "/" + filename;
   LOG(FATAL) << "opening file with index " << current_index_ << ", in lumisection " << ls;
 
   outputFile_ =
@@ -132,9 +133,8 @@ std::string OutputFileHandler::format_filename(uint32_t run_number, uint32_t ind
   std::ostringstream ofilename;
 
   if (this->OutputFileHandler::getCMSSWHeaders()) {
-    ofilename << "run" << std::setfill('0') << std::setw(6) << run_number << "_ls"
-              << std::setfill('0') << std::setw(4) << ls << "_index" << std::setfill('0')
-              << std::setw(6) << index % (max_index_per_ls_ + 1) << filename_suffix_;
+    ofilename << GetRunFormatted(run_number) << "_" << GetLumiFormatted(ls) << "_"
+              << GetFileIndexFormatted(index % (max_index_per_ls_ + 1)) << filename_suffix_;
 
   } else {
     ofilename << filename_prefix_ << "_" << std::setfill('0') << std::setw(6) << run_number << "_"
@@ -174,8 +174,8 @@ void OutputFileHandler::close_and_rename::operator()() const {
 
 void OutputFileHandler::write_EoLS_file(uint32_t ls) {
   std::stringstream EoLS_filename_stringstream;
-  EoLS_filename_stringstream << "run" << std::setfill('0') << std::setw(6) << current_run_number_
-                             << "_ls" << std::setfill('0') << std::setw(4) << ls << "_EoLS.jsn";
+  EoLS_filename_stringstream << GetRunFormatted(current_run_number_) << "_" << GetLumiFormatted(ls)
+                             << "_EoLS.jsn";
   std::string EoLS_filename = EoLS_filename_stringstream.str();
   std::string full_filename = run_dir_ + "/" + EoLS_filename;
   std::stringstream EoLS_file_string_stream;
@@ -189,8 +189,8 @@ void OutputFileHandler::write_EoLS_file(uint32_t ls) {
                           << constants::N_orbits_per_lumisection << "\","   // Total Events
                           << "\"0\",\""                                     // NLost Events
                           << ls_file_size_ << "\"],\n  \"definition\":\""   // NBytes
-                          << "/fff/ramdisk/run" << std::setfill('0') << std::setw(6)
-                          << current_run_number_ << "/jsd/EoLS.jsd\",\n  \"source\":\"l1scout\"\n}";
+                          << "/fff/ramdisk/" << GetRunFormatted(current_run_number_)
+                          << "/jsd/EoLS.jsd\",\n  \"source\":\"l1scout\"\n}";
 
   ls_file_size_ = 0;
   run_NOrbits_ += ls_NOrbits_;
@@ -203,9 +203,7 @@ void OutputFileHandler::write_EoR_file() {
   assert(current_index_ > 0 && nOrbitsPerFile_ > 0);
   int ls = int(1) + (current_index_ * nOrbitsPerFile_) / constants::N_orbits_per_lumisection;
   std::stringstream EoR_filename;
-  EoR_filename << run_dir_ << "/"
-               << "run" << std::setfill('0') << std::setw(6) << current_run_number_
-               << "_ls0000_EoR.jsn";
+  EoR_filename << run_dir_ << "/" << GetRunFormatted(current_run_number_) << "_ls0000_EoR.jsn";
   LOG(TRACE) << "Writing EoR file " << EoR_filename.str();
   std::fstream EoR_file;
   EoR_file.open(EoR_filename.str().c_str(), std::ios_base::out);
@@ -216,8 +214,8 @@ void OutputFileHandler::write_EoR_file() {
                                 (nOrbitsPerFile_ * current_index_)  // NFiles
                          << "\",\"" << ls << "\",\""                // NLumis
                          << ls << "\"],\n  \"definition\":\""       // LastLumi
-                         << "/fff/ramdisk/run" << std::setfill('0') << std::setw(6)
-                         << current_run_number_ << "/jsd/EoR.jsd\",\n  \"source\":\"l1scout\"\n}";
+                         << "/fff/ramdisk/" << GetRunFormatted(current_run_number_)
+                         << "/jsd/EoR.jsd\",\n  \"source\":\"l1scout\"\n}";
   EoR_file << EoR_file_string_stream.str();
   EoR_file.close();
 }

src/OutputFileHandler.h

@@ -6,6 +6,7 @@
 #include <atomic>
 #include <cstdint>
 #include <cstdio>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <thread>
@@ -15,15 +16,33 @@
 #include "cmssw/FRDFileHeader_v2.h"
 #include "format.h"
 
+// Refactoring common strings out
+inline std::string GetRunFormatted(uint64_t run_number) {
+  std::ostringstream ss;
+  ss << "run" << std::setfill('0') << std::setw(6) << run_number;
+  return ss.str();
+}
+
+inline std::string GetFileIndexFormatted(uint64_t file_index) {
+  std::ostringstream ss;
+  ss << "index" << std::setfill('0') << std::setw(6) << file_index;
+  return ss.str();
+}
+
+inline std::string GetLumiFormatted(uint32_t ls) {
+  std::ostringstream ss;
+  ss << "ls" << std::setfill('0') << std::setw(4) << ls;
+  return ss.str();
+}
+
 class OutputFileHandler {
  public:
   OutputFileHandler(std::string base_path, std::string filename_prefix, std::string filename_suffix,
                     int num_orbits_per_file, const bool has_cmssw_headers, int source_id)
-      : base_path_(std::move(base_path)),
-        run_dir_(base_path_ + "/run000000"),
-        filename_prefix_(std::move(filename_prefix)),
+      : base_path_(base_path),
+        run_dir_(base_path + "/" + GetRunFormatted(0)),
+        filename_prefix_(filename_prefix),
         filename_suffix_(std::move(filename_suffix)),
-        working_files_base_path_(base_path_ + "/" + working_dir_),
         current_run_number_(-1),
         current_index_(-1),
         close_and_rename_(base_path_, num_orbits_per_file),