Extract both lumis from CTP CTF

Also the HBF count for the 2nd lumi was not propagated to the CTF,
now it is done (though it is anyway the same as the main lumi HBF counts)

Author: shahor02

DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h

@@ -29,15 +29,16 @@ namespace ctp
 struct CTFHeader : public o2::ctf::CTFDictHeader {
   uint64_t lumiCounts = 0;    /// FT0 Luminosity counts moving average over lumiNHBFs orbits
   uint64_t lumiCountsFV0 = 0; /// FV0 Luminosity counts moving average over lumiNHBFs orbits
-  uint32_t lumiNHBFs = 0;  /// Number of HBFs over which lumi is integrated
-  uint32_t lumiOrbit = 0;  /// 1st orbit of TF where lumi was updated, can be compared with firstOrbit
-  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, 4);
+  uint32_t lumiNHBFs = 0;     /// Number of HBFs over which lumi is integrated
+  uint32_t lumiNHBFsFV0 = 0;  /// Number of FV0 HBFs over which lumi is integrated
+  uint32_t lumiOrbit = 0;     /// 1st orbit of TF where lumi was updated, can be compared with firstOrbit
+  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, 5);
 };
 
 /// wrapper for the Entropy-encoded trigger inputs and classes of the TF

Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h

@@ -147,7 +147,9 @@ o2::ctf::CTFIOSize CTFCoder::decode(const CTF::base& ec, VTRG& data, LumiInfo& l
   std::map<o2::InteractionRecord, CTPDigit> digitsMap;
   o2::InteractionRecord ir(header.firstBC, header.firstOrbit);
   lumi.nHBFCounted = header.lumiNHBFs;
+  lumi.nHBFCountedFV0 = header.lumiNHBFsFV0 ? header.lumiNHBFsFV0 : header.lumiNHBFs;
   lumi.counts = header.lumiCounts;
+  lumi.countsFV0 = header.lumiCountsFV0;
   lumi.orbit = header.lumiOrbit;
   lumi.inp1 = int(header.inp1);
   lumi.inp2 = int(header.inp2);

Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h

@@ -38,7 +38,7 @@ class CTFHelper
   CTFHeader createHeader(const LumiInfo& lumi)
   {
     CTFHeader h{o2::detectors::DetID::CTP, 0, 1, 0, // dummy timestamp, version 1.0
-                lumi.counts, lumi.countsFV0, lumi.nHBFCounted, lumi.orbit,
+                lumi.counts, lumi.countsFV0, lumi.nHBFCounted, lumi.nHBFCountedFV0, lumi.orbit,
                 uint32_t(mData.size()), 0, 0, uint16_t(lumi.inp1), uint16_t(lumi.inp2)};
     if (mData.size()) {
       h.firstOrbit = mData[0].intRecord.orbit;