Skip to content

Commit 0e0c7bd

Browse files
committed
Fix conflict: avoid device options with generic names in the workflow options
1 parent ad54efd commit 0e0c7bd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Detectors/ITSMFT/common/workflow/src/DeadMapBuilderSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void ITSMFTDeadMapBuilder::init(InitContext& ic)
5858
mTFSampling = ic.options().get<int>("tf-sampling");
5959
mTFLength = ic.options().get<int>("tf-length");
6060
mDoLocalOutput = ic.options().get<bool>("local-output");
61-
mObjectName = ic.options().get<std::string>("output-filename");
61+
mObjectName = ic.options().get<std::string>("outfile");
6262
mLocalOutputDir = ic.options().get<std::string>("output-dir");
6363

6464
LOG(info) << "Sampling one TF every " << mTFSampling;
@@ -296,7 +296,7 @@ DataProcessorSpec getITSMFTDeadMapBuilderSpec(std::string datasource, bool doMFT
296296
AlgorithmSpec{adaptFromTask<ITSMFTDeadMapBuilder>(datasource, doMFT)},
297297
Options{{"tf-sampling", VariantType::Int, 1000, {"Process every Nth TF. Selection according to first TF orbit."}},
298298
{"tf-length", VariantType::Int, 32, {"Orbits per TF."}},
299-
{"output-filename", VariantType::String, objectname_default, {"ROOT object file name."}},
299+
{"outfile", VariantType::String, objectname_default, {"ROOT object file name."}},
300300
{"local-output", VariantType::Bool, false, {"Save ROOT tree file locally."}},
301301
{"output-dir", VariantType::String, "./", {"ROOT tree local output directory."}}}};
302302
}

Detectors/MUON/MID/Workflow/src/decoded-digits-writer-workflow.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
2727
{
2828
std::vector<ConfigParamSpec>
2929
options{
30-
{"output-filename", VariantType::String, "mid-digits-decoded.root", {"Decoded digits output file"}},
31-
{"mid-digits-tree-name", VariantType::String, "middigits", {"Name of tree in digits file"}}};
30+
{"default-mid-digits-output-filename", VariantType::String, "mid-digits-decoded.root", {"Decoded digits output file"}},
31+
{"default-mid-digits-tree-name", VariantType::String, "middigits", {"Name of tree in digits file"}}};
3232
workflowOptions.insert(workflowOptions.end(), options.begin(), options.end());
3333
}
3434

@@ -45,8 +45,8 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
4545

4646
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
4747
{
48-
auto outputFilename = cfgc.options().get<std::string>("output-filename");
49-
auto treeFilename = cfgc.options().get<std::string>("mid-digits-tree-name");
48+
auto outputFilename = cfgc.options().get<std::string>("default-mid-digits-output-filename");
49+
auto treeFilename = cfgc.options().get<std::string>("default-mid-digits-tree-name");
5050
WorkflowSpec specs;
5151
specs.emplace_back(MakeRootTreeWriterSpec("MIDDigitWriter",
5252
outputFilename.c_str(),

0 commit comments

Comments
 (0)