Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolves naming conflicts in partial files in hadd
Appends the same unique identifier to the name of the partial files
within the same hadd execution.
  • Loading branch information
xvallspl committed Apr 11, 2017
commit e2f5058aebe3b158bbf46306a28de3c3658f6f08
5 changes: 4 additions & 1 deletion main/src/hadd.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
#include "Riostream.h"
#include "TClass.h"
#include "TSystem.h"
#include "TUUID.h"
#include "ROOT/StringConv.hxx"
#include <stdlib.h>
#include <climits>
Expand Down Expand Up @@ -405,9 +406,11 @@ int main( int argc, char **argv )
std::vector<std::string> partialFiles;

if (multiproc) {
auto uuid = TUUID();
auto partialTail = uuid.AsString();
for (auto i = 0; (i * step) < filesToProcess; i++) {
std::stringstream buffer;
buffer << "partial" << i << ".root";
buffer << "partial" << i << "_" << partialTail << ".root";
partialFiles.emplace_back(buffer.str());
}
}
Expand Down