Add countsFV0 to LumiInfo as backup for nominal FT0 lumi

shahor02 · shahor02 · commit b04894e9e97f · 2022-11-20T15:45:19.000+01:00
diff --git a/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h b/DataFormats/Detectors/CTP/include/DataFormatsCTP/CTF.h
@@ -27,14 +27,15 @@ namespace ctp
 
 /// Header for a single CTF
 struct CTFHeader : public o2::ctf::CTFDictHeader {
-  uint64_t lumiCounts = 0; /// Luminosity counts moving average over lumiNHBFs orbits
+  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
 
-  ClassDefNV(CTFHeader, 2);
+  ClassDefNV(CTFHeader, 3);
 };
 
 /// wrapper for the Entropy-encoded trigger inputs and classes of the TF
diff --git a/DataFormats/Detectors/CTP/include/DataFormatsCTP/LumiInfo.h b/DataFormats/Detectors/CTP/include/DataFormatsCTP/LumiInfo.h
@@ -24,10 +24,13 @@ struct LumiInfo {
   LumiInfo() = default;
   uint32_t orbit = 0;       // orbit of TF when was updated
   uint32_t nHBFCounted = 0; // length of interval in HB
-  uint64_t counts = 0;      // counts in the interval
+  uint64_t counts = 0;      // counts in the interval for the nominal lumi detector (FT0)
+  uint64_t countsFV0 = 0;   // connts for FV0 (less reliable)
   float getLumi() const { return nHBFCounted > 0 ? float(counts / (nHBFCounted * o2::constants::lhc::LHCOrbitMUS * 1e-6)) : 0.f; }
+  float getLumiFV0() const { return nHBFCounted > 0 ? float(countsFV0 / (nHBFCounted * o2::constants::lhc::LHCOrbitMUS * 1e-6)) : 0.f; }
   float getLumiError() const { return nHBFCounted > 0 ? float(std::sqrt(counts) / (nHBFCounted * o2::constants::lhc::LHCOrbitMUS * 1e-6)) : 0.f; }
-  ClassDefNV(LumiInfo, 1);
+  float getLumiFV0Error() const { return nHBFCounted > 0 ? float(std::sqrt(countsFV0) / (nHBFCounted * o2::constants::lhc::LHCOrbitMUS * 1e-6)) : 0.f; }
+  ClassDefNV(LumiInfo, 2);
 };
 } // namespace ctp
 
diff --git a/Detectors/CTP/reconstruction/include/CTPReconstruction/CTFHelper.h b/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.nHBFCounted, lumi.orbit,
+                lumi.counts, lumi.countsFV0, lumi.nHBFCounted, lumi.orbit,
                 uint32_t(mData.size()), 0, 0};
     if (mData.size()) {
       h.firstOrbit = mData[0].intRecord.orbit;

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class CTFHelper`
`38`	`38`	`CTFHeader createHeader(const LumiInfo& lumi)`
`39`	`39`	`{`
`40`	`40`	`CTFHeader h{o2::detectors::DetID::CTP, 0, 1, 0, // dummy timestamp, version 1.0`
`41`		`- lumi.counts, lumi.nHBFCounted, lumi.orbit,`
	`41`	`+ lumi.counts, lumi.countsFV0, lumi.nHBFCounted, lumi.orbit,`
`42`	`42`	`uint32_t(mData.size()), 0, 0};`
`43`	`43`	`if (mData.size()) {`
`44`	`44`	`h.firstOrbit = mData[0].intRecord.orbit;`