Skip to content

raw-file-reader: move run-number option from w-flow to device level #14337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 1 commit into from
May 28, 2025
Merged

raw-file-reader: move run-number option from w-flow to device level #14337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Detectors/Raw/include/DetectorsRaw/RawFileReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ struct ReaderInp {
size_t bufferSize = 1024L * 1024L;
size_t minSHM = 0;
int loop = 1;
int runNumber = 0;
uint32_t delay_us = 0;
uint32_t errMap = 0xffffffff;
uint32_t minTF = 0;
Expand Down
5 changes: 4 additions & 1 deletion Detectors/Raw/src/RawFileReaderWorkflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class RawReaderSpecs : public o2f::Task

//___________________________________________________________
RawReaderSpecs::RawReaderSpecs(const ReaderInp& rinp)
: mLoop(rinp.loop < 0 ? INT_MAX : (rinp.loop < 1 ? 1 : rinp.loop)), mDelayUSec(rinp.delay_us), mMinTFID(rinp.minTF), mMaxTFID(rinp.maxTF), mRunNumber(rinp.runNumber), mPartPerSP(rinp.partPerSP), mSup0xccdb(rinp.sup0xccdb), mReader(std::make_unique<o2::raw::RawFileReader>(rinp.inifile, 0, rinp.bufferSize, rinp.onlyDet)), mRawChannelName(rinp.rawChannelConfig), mPreferCalcTF(rinp.preferCalcTF), mMinSHM(rinp.minSHM)
: mLoop(rinp.loop < 0 ? INT_MAX : (rinp.loop < 1 ? 1 : rinp.loop)), mDelayUSec(rinp.delay_us), mMinTFID(rinp.minTF), mMaxTFID(rinp.maxTF), mPartPerSP(rinp.partPerSP), mSup0xccdb(rinp.sup0xccdb), mReader(std::make_unique<o2::raw::RawFileReader>(rinp.inifile, 0, rinp.bufferSize, rinp.onlyDet)), mRawChannelName(rinp.rawChannelConfig), mPreferCalcTF(rinp.preferCalcTF), mMinSHM(rinp.minSHM)
{
mReader->setCheckErrors(rinp.errMap);
mReader->setMaxTFToRead(rinp.maxTF);
Expand Down Expand Up @@ -149,6 +149,7 @@ void RawReaderSpecs::init(o2f::InitContext& ic)
mTimer.Start();
mTimer.Stop();
mVerbosity = ic.options().get<int>("verbosity-level");
mRunNumber = ic.options().get<int>("run-number");
mReader->setVerbosity(mVerbosity);
mReader->init();
if (mMaxTFID >= mReader->getNTimeFrames()) {
Expand Down Expand Up @@ -418,6 +419,8 @@ o2f::DataProcessorSpec getReaderSpec(ReaderInp rinp)

spec.algorithm = o2f::adaptFromTask<RawReaderSpecs>(rinp);
spec.options.emplace_back(o2f::ConfigParamSpec{"verbosity-level", o2f::VariantType::Int, 0, {"verbosity level"}});
spec.options.emplace_back(o2f::ConfigParamSpec{"run-number", o2f::VariantType::Int, 0, {"impose run number"}});

return spec;
}

Expand Down
2 changes: 0 additions & 2 deletions Detectors/Raw/src/rawfile-reader-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
options.push_back(ConfigParamSpec{"onlyDet", VariantType::String, "all", {"list of dectors"}});
options.push_back(ConfigParamSpec{"min-tf", VariantType::Int64, 0L, {"min TF ID to process"}});
options.push_back(ConfigParamSpec{"max-tf", VariantType::Int64, 0xffffffffL, {"max TF ID to process"}});
options.push_back(ConfigParamSpec{"run-number", VariantType::Int, 0, {"impose run number"}});
options.push_back(ConfigParamSpec{"loop", VariantType::Int, 1, {"loop N times (infinite for N<0)"}});
options.push_back(ConfigParamSpec{"delay", VariantType::Float, 0.f, {"delay in seconds between consecutive TFs sending"}});
options.push_back(ConfigParamSpec{"buffer-size", VariantType::Int64, 5 * 1024L, {"buffer size for files preprocessing"}});
Expand Down Expand Up @@ -67,7 +66,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
rinp.onlyDet = configcontext.options().get<std::string>("onlyDet");
rinp.maxTF = uint32_t(configcontext.options().get<int64_t>("max-tf"));
rinp.minTF = uint32_t(configcontext.options().get<int64_t>("min-tf"));
rinp.runNumber = configcontext.options().get<int>("run-number");
rinp.bufferSize = uint64_t(configcontext.options().get<int64_t>("buffer-size"));
rinp.spSize = uint64_t(configcontext.options().get<int64_t>("super-page-size"));
rinp.partPerSP = configcontext.options().get<bool>("part-per-sp");
Expand Down