Skip to content

Optionally impose DH.tfCounter from local counter #8643

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
Apr 25, 2022
Merged

Optionally impose DH.tfCounter from local counter #8643

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
7 changes: 6 additions & 1 deletion DataFormats/Detectors/Common/src/CTFHeader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ using DetID = o2::detectors::DetID;
/// describe itsel as a string
std::string CTFHeader::describe() const
{
return fmt::format("Run:{:07d} TF{} Orbit:{:08d} CteationTime:{} Detectors: {}", run, tfCounter, firstTForbit, creationTime, DetID::getNames(detectors));
return fmt::format("Run:{:07d} TF:{} Orbit:{:08d} CteationTime:{} Detectors: {}", run, tfCounter, firstTForbit, creationTime, DetID::getNames(detectors));
}

void CTFHeader::print() const
{
LOG(info) << describe();
}

std::ostream& o2::ctf::operator<<(std::ostream& stream, const CTFHeader& h)
Expand Down
11 changes: 9 additions & 2 deletions Detectors/CTF/workflow/src/CTFReaderSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class CTFReaderSpec : public o2::framework::Task
std::unique_ptr<TFile> mCTFFile;
std::unique_ptr<TTree> mCTFTree;
bool mRunning = false;
bool mUseLocalTFCounter = false;
int mCTFCounter = 0;
int mNFailedFiles = 0;
int mFilesRead = 0;
Expand Down Expand Up @@ -134,6 +135,7 @@ void CTFReaderSpec::stopReader()
void CTFReaderSpec::init(InitContext& ic)
{
mInput.ctfIDs = o2::RangeTokenizer::tokenize<int>(ic.options().get<std::string>("select-ctf-ids"));
mUseLocalTFCounter = ic.options().get<bool>("local-tf-counter");
mRunning = true;
mFileFetcher = std::make_unique<o2::utils::FileFetcher>(mInput.inpdata, mInput.tffileRegex, mInput.remoteRegex, mInput.copyCmd);
mFileFetcher->setMaxFilesInQueue(mInput.maxFileCache);
Expand Down Expand Up @@ -230,6 +232,10 @@ void CTFReaderSpec::processTF(ProcessingContext& pc)
tryToFixCTFHeader(ctfHeader);
}

if (mUseLocalTFCounter) {
ctfHeader.tfCounter = mCTFCounter;
}

LOG(info) << ctfHeader;

auto& timingInfo = pc.services().get<TimingInfo>();
Expand Down Expand Up @@ -310,7 +316,7 @@ void CTFReaderSpec::setMessageHeader(ProcessingContext& pc, const CTFHeader& ctf
}
auto dh = const_cast<o2::header::DataHeader*>(o2::header::get<o2::header::DataHeader*>(stack));
dh->firstTForbit = ctfHeader.firstTForbit;
dh->tfCounter = mCTFCounter;
dh->tfCounter = ctfHeader.tfCounter;
dh->runNumber = uint32_t(ctfHeader.run);
auto dph = const_cast<o2::framework::DataProcessingHeader*>(o2::header::get<o2::framework::DataProcessingHeader*>(stack));
dph->creation = ctfHeader.creationTime;
Expand Down Expand Up @@ -400,7 +406,8 @@ DataProcessorSpec getCTFReaderSpec(const CTFReaderInp& inp)
Inputs{},
outputs,
AlgorithmSpec{adaptFromTask<CTFReaderSpec>(inp)},
Options{{"select-ctf-ids", VariantType::String, "", {"comma-separated list CTF IDs to inject (from cumulative counter of CTFs seen)"}}}};
Options{{"select-ctf-ids", VariantType::String, "", {"comma-separated list CTF IDs to inject (from cumulative counter of CTFs seen)"}},
{"local-tf-counter", VariantType::Bool, false, {"reassign header.tfCounter from local TF counter"}}}};
}

} // namespace ctf
Expand Down