Skip to content

Commit e0448f2

Browse files
authored
few fixes in tiered file access (#9795)
1 parent a1c0fd6 commit e0448f2

4 files changed

Lines changed: 5 additions & 3 deletions

File tree

Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ AlgorithmSpec AODJAlienReaderHelpers::rootFileReaderCallback()
257257
std::string currentFilename(fileAndFolder.file->GetName());
258258
if (strcmp(fileAndFolder.file->GetEndpointUrl()->GetProtocol(), "file") == 0 && fileAndFolder.file->GetEndpointUrl()->GetFile()[0] != '/') {
259259
// This is not an absolute local path. Make it absolute.
260-
currentFilename = gSystem->pwd() + std::string("/") + std::string(fileAndFolder.file->GetName());
260+
static std::string pwd = gSystem->pwd() + std::string("/");
261+
currentFilename = pwd + std::string(fileAndFolder.file->GetName());
261262
}
262263
outputs.make<std::string>(o2) = currentFilename;
263264
}

Framework/AnalysisSupport/src/DataInputDirector.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ bool DataInputDescriptor::setFile(int counter)
127127
mcurrentFile->SetReadaheadSize(50 * 1024 * 1024);
128128

129129
// get the parent file map if exists
130-
mParentFileMap = (TMap*)mcurrentFile->Get("parent_files"); // folder name (DF_XXX) --> parent file (absolute path)
130+
mParentFileMap = (TMap*)mcurrentFile->Get("parentFiles"); // folder name (DF_XXX) --> parent file (absolute path)
131131
if (mParentFileMap && !mParentFileReplacement.empty()) {
132132
auto pos = mParentFileReplacement.find(';');
133133
if (pos == std::string::npos) {

Framework/Core/src/DataOutputDirector.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ void DataOutputDirector::closeDataFiles()
474474
if (filePtr) {
475475
if (filePtr->IsOpen() && mParentMaps[i]->GetEntries() > 0) {
476476
filePtr->cd("/");
477-
filePtr->WriteObject(mParentMaps[i], "parent_files");
477+
filePtr->WriteObject(mParentMaps[i], "parentFiles");
478478
}
479479
filePtr->Close();
480480
}

Framework/Core/src/WorkflowHelpers.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext
289289
AlgorithmSpec::dummyAlgorithm(),
290290
{ConfigParamSpec{"aod-file", VariantType::String, {"Input AOD file"}},
291291
ConfigParamSpec{"aod-reader-json", VariantType::String, {"json configuration file"}},
292+
ConfigParamSpec{"aod-parent-base-path-replacement", VariantType::String, {"Replace base path of parent files. Syntax: FROM;TO. E.g. alien:///path/in/alien;/local/path"}},
292293
ConfigParamSpec{"time-limit", VariantType::Int64, 0ll, {"Maximum run time limit in seconds"}},
293294
ConfigParamSpec{"orbit-offset-enumeration", VariantType::Int64, 0ll, {"initial value for the orbit"}},
294295
ConfigParamSpec{"orbit-multiplier-enumeration", VariantType::Int64, 0ll, {"multiplier to get the orbit from the counter"}},

0 commit comments

Comments
 (0)