Skip to content

Commit 71b29c2

Browse files
authored
Merge pull request #22 from alibuild/alibot-cleanup-15593
Please consider the following formatting changes to #15593
2 parents 21b4e88 + 23d7005 commit 71b29c2

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

Generators/src/MergeEventPool.cxx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ std::optional<std::vector<std::string>> readAlienListFileLines(std::string const
112112
}
113113
static std::atomic<int> counter{0};
114114
const auto tmpPath = fs::temp_directory_path() /
115-
fs::path("merge-evtpool-list-" + std::to_string(::getpid()) + "-" + std::to_string(counter++) + ".txt");
115+
fs::path("merge-evtpool-list-" + std::to_string(::getpid()) + "-" + std::to_string(counter++) + ".txt");
116116

117117
TString cmd = Form("alien_cp %s file:%s", entry.c_str(), tmpPath.c_str());
118118
const bool fetched = gSystem->Exec(cmd.Data()) == 0;
@@ -271,8 +271,8 @@ std::vector<Event> readFile(std::string const& file, std::string const& treename
271271
// per thread); a single writer (this thread) fills the output tree strictly in input-file
272272
// order as soon as each file's buffer is ready.
273273
Long64_t mergeFiles(std::vector<std::string> const& files, std::string const& treename,
274-
std::string const& outfile, std::vector<Long64_t> const& entryCounts,
275-
UInt_t startId, unsigned int jobs)
274+
std::string const& outfile, std::vector<Long64_t> const& entryCounts,
275+
UInt_t startId, unsigned int jobs)
276276
{
277277
TFile fout(outfile.c_str(), "RECREATE");
278278
if (fout.IsZombie()) {
@@ -383,15 +383,10 @@ Long64_t mergeFiles(std::vector<std::string> const& files, std::string const& tr
383383
int main(int argc, char* argv[])
384384
{
385385
bpo::options_description options("o2-generators-merge-evtpool options");
386-
options.add_options()
387-
("input,i", bpo::value<std::string>()->required(), "comma-separated list of inputs: event-pool ROOT files "
388-
", and/or text files (local or alien://, fetched via alien_cp) listing more "
389-
"paths (one per line, '#' comments allowed)")
390-
("output,o", bpo::value<std::string>()->default_value("evtpool.root"), "output ROOT file with the merged event pool")
391-
("treename,t", bpo::value<std::string>()->default_value("o2sim"), "name of the tree to merge")
392-
("start-id", bpo::value<UInt_t>()->default_value(1), "event ID assigned to the first merged event")
393-
("jobs,j", bpo::value<unsigned int>()->default_value(8), "number of worker threads used to read input files in parallel (0 = auto-detect)")
394-
("help,h", "produce help message");
386+
options.add_options()("input,i", bpo::value<std::string>()->required(),
387+
"comma-separated list of inputs: event-pool ROOT files "
388+
", and/or text files (local or alien://, fetched via alien_cp) listing more "
389+
"paths (one per line, '#' comments allowed)")("output,o", bpo::value<std::string>()->default_value("evtpool.root"), "output ROOT file with the merged event pool")("treename,t", bpo::value<std::string>()->default_value("o2sim"), "name of the tree to merge")("start-id", bpo::value<UInt_t>()->default_value(1), "event ID assigned to the first merged event")("jobs,j", bpo::value<unsigned int>()->default_value(8), "number of worker threads used to read input files in parallel (0 = auto-detect)")("help,h", "produce help message");
395390

396391
bpo::variables_map vm;
397392
try {

0 commit comments

Comments
 (0)