Skip to content

Commit 0b1ec43

Browse files
committed
Move mem-factor option from MCH decoder to encoder
1 parent fcbe55d commit 0b1ec43

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Detectors/MUON/MCH/Workflow/src/EntropyDecoderSpec.cxx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ EntropyDecoderSpec::EntropyDecoderSpec()
5050
void EntropyDecoderSpec::init(o2::framework::InitContext& ic)
5151
{
5252
std::string dictPath = ic.options().get<std::string>("ctf-dict");
53-
mCTFCoder.setMemMarginFactor(ic.options().get<float>("mem-factor"));
5453
if (!dictPath.empty() && dictPath != "none") {
5554
mCTFCoder.createCoders(dictPath, o2::ctf::CTFCoderBase::OpType::Decoder);
5655
}
@@ -91,8 +90,7 @@ DataProcessorSpec getEntropyDecoderSpec(const char* specName)
9190
Inputs{InputSpec{"ctf", "MCH", "CTFDATA", 0, Lifetime::Timeframe}},
9291
outputs,
9392
AlgorithmSpec{adaptFromTask<EntropyDecoderSpec>()},
94-
Options{{"ctf-dict", VariantType::String, o2::base::NameConf::getCTFDictFileName(), {"File of CTF decoding dictionary"}},
95-
{"mem-factor", VariantType::Float, 1.f, {"Memory allocation margin factor"}}}};
93+
Options{{"ctf-dict", VariantType::String, o2::base::NameConf::getCTFDictFileName(), {"File of CTF decoding dictionary"}}}};
9694
}
9795

9896
} // namespace mch

Detectors/MUON/MCH/Workflow/src/entropy-encoder-workflow.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ EntropyEncoderSpec::EntropyEncoderSpec()
5050
void EntropyEncoderSpec::init(o2::framework::InitContext& ic)
5151
{
5252
std::string dictPath = ic.options().get<std::string>("ctf-dict");
53+
mCTFCoder.setMemMarginFactor(ic.options().get<float>("mem-factor"));
5354
if (!dictPath.empty() && dictPath != "none") {
5455
mCTFCoder.createCoders(dictPath, o2::ctf::CTFCoderBase::OpType::Encoder);
5556
}
@@ -90,7 +91,8 @@ DataProcessorSpec getEntropyEncoderSpec(const char* specName)
9091
inputs,
9192
Outputs{{"MCH", "CTFDATA", 0, Lifetime::Timeframe}},
9293
AlgorithmSpec{adaptFromTask<EntropyEncoderSpec>()},
93-
Options{{"ctf-dict", VariantType::String, o2::base::NameConf::getCTFDictFileName(), {"Path to pre-computed CTF encoding dictionary to be used for encoding"}}}};
94+
Options{{"ctf-dict", VariantType::String, o2::base::NameConf::getCTFDictFileName(), {"Path to pre-computed CTF encoding dictionary to be used for encoding"}},
95+
{"mem-factor", VariantType::Float, 1.f, {"Memory allocation margin factor"}}}};
9496
}
9597

9698
} // namespace mch

0 commit comments

Comments
 (0)