From de5325070d660944c5ffe51da1864e262ce90e9c Mon Sep 17 00:00:00 2001 From: shahoian Date: Fri, 22 Sep 2023 00:25:20 +0200 Subject: [PATCH] Add CTP Lumi inputs to its CTF header --- DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h | 4 +++- .../CTP/reconstruction/include/CTPReconstruction/CTFCoder.h | 2 ++ .../CTP/reconstruction/include/CTPReconstruction/CTFHelper.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h b/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h index 8481db8f6d7e5..eb6c2cb98c761 100644 --- a/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h +++ b/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h @@ -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 diff --git a/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h b/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h index deef6149e0d0e..efe31c431d368 100644 --- a/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h +++ b/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h @@ -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 ? diff --git a/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h b/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h index 89859e8cdbb3a..b2847a59ab3ff 100644 --- a/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h +++ b/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h @@ -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;