Skip to content

Add CTP Lumi inputs to its CTF header #11935

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
martenole merged 1 commit into from
Sep 22, 2023
Merged

Add CTP Lumi inputs to its CTF header #11935

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
4 changes: 3 additions & 1 deletion DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ struct CTFHeader : public o2::ctf::CTFDictHeader {
uint32_t nTriggers = 0; /// number of triggers
uint32_t firstOrbit = 0; /// orbit of 1st trigger
uint16_t firstBC = 0; /// bc of 1st trigger
uint16_t inp1 = 0; /// lumiCounts input ID
uint16_t inp2 = 0; /// lumiCountsFV0 input ID

ClassDefNV(CTFHeader, 3);
ClassDefNV(CTFHeader, 4);
};

/// wrapper for the Entropy-encoded trigger inputs and classes of the TF
Expand Down
2 changes: 2 additions & 0 deletions Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ o2::ctf::CTFIOSize CTFCoder::decode(const CTF::base& ec, VTRG& data, LumiInfo& l
lumi.nHBFCounted = header.lumiNHBFs;
lumi.counts = header.lumiCounts;
lumi.orbit = header.lumiOrbit;
lumi.inp1 = int(header.inp1);
lumi.inp2 = int(header.inp2);
auto itInp = bytesInput.begin();
auto itCls = bytesClass.begin();
bool checkIROK = (mBCShift == 0); // need to check if CTP offset correction does not make the local time negative ?
Expand Down
2 changes: 1 addition & 1 deletion Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CTFHelper
{
CTFHeader h{o2::detectors::DetID::CTP, 0, 1, 0, // dummy timestamp, version 1.0
lumi.counts, lumi.countsFV0, lumi.nHBFCounted, lumi.orbit,
uint32_t(mData.size()), 0, 0};
uint32_t(mData.size()), 0, 0, uint16_t(lumi.inp1), uint16_t(lumi.inp2)};
if (mData.size()) {
h.firstOrbit = mData[0].intRecord.orbit;
h.firstBC = mData[0].intRecord.bc;
Expand Down