Remove beam period notion, orbit is 32bit long

Since in Run3 the orbit will be 32 bits long (can cover ~100h) and will be reset in the beginning
of every fill, we do not need notion of the period in the BC identification (orbit never wraps)

Author: shahor02

Common/Constants/include/CommonConstants/LHCConstants.h

@@ -29,12 +29,7 @@ static constexpr double LHCBunchSpacingNS = 10 * 1.e9 / LHCRFFreq;      // bunch
 static constexpr double LHCOrbitNS = LHCMaxBunches * LHCBunchSpacingNS; // orbit duration in ns
 static constexpr double LHCRevFreq = 1.e9 / LHCOrbitNS;                 // revolution frequency
 
-// ALICE conventions
-static constexpr int MaxNOrbits = 0x1 << 24; // above this (~24min) period is incremented
-static constexpr int OrbitMask = MaxNOrbits - 1;
-static constexpr int MaxNPeriods = 0x1 << 28;
-static constexpr int PreioidMask = MaxNPeriods - 1;
-static constexpr double PeriodDurationNS = MaxNOrbits * LHCOrbitNS;
+static constexpr unsigned int MaxNOrbits = 0xffffffff;
 }
 }
 }

DataFormats/common/include/CommonDataFormat/InteractionRecord.h

@@ -21,10 +21,9 @@
 namespace o2
 {
 struct InteractionRecord {
-  double timeNS = 0.; ///< time in NANOSECONDS from start of run (period=0, orbit=0)
+  double timeNS = 0.; ///< time in NANOSECONDS from start of run (orbit=0)
   int bc = 0;         ///< bunch crossing ID of interaction
-  int orbit = 0;      ///< LHC orbit
-  int period = 0;     ///< LHC period since beginning of run (if >0 -> time precision loss)
+  unsigned int orbit = 0; ///< LHC orbit
 
   InteractionRecord() = default;
 
@@ -33,37 +32,32 @@ struct InteractionRecord {
     setFromNS(tNS);
   }
 
-  InteractionRecord(int b, int orb, int per = 0) : bc(b), orbit(orb), period(per)
+  InteractionRecord(int b, unsigned int orb) : bc(b), orbit(orb)
   {
-    timeNS = bc2ns(bc, orbit, period);
+    timeNS = bc2ns(bc, orbit);
   }
 
   void setFromNS(double ns)
   {
     timeNS = ns;
-    bc = ns2bc(ns, orbit, period);
+    bc = ns2bc(ns, orbit);
   }
 
-  static double bc2ns(int bc, int orbit, int period)
+  static double bc2ns(int bc, unsigned int orbit)
   {
-    double t = bc * o2::constants::lhc::LHCBunchSpacingNS + orbit * o2::constants::lhc::LHCOrbitNS;
-    return period ? t + o2::constants::lhc::PeriodDurationNS : t;
+    return bc * o2::constants::lhc::LHCBunchSpacingNS + orbit * o2::constants::lhc::LHCOrbitNS;
   }
 
-  static int ns2bc(double ns, int& orb, int& per)
+  static int ns2bc(double ns, unsigned int& orb)
   {
-    per = ns / o2::constants::lhc::PeriodDurationNS;
-    if (per) {
-      ns -= per * o2::constants::lhc::PeriodDurationNS;
-    }
-    orb = ns / o2::constants::lhc::LHCOrbitNS;
+    orb = ns > 0 ? ns / o2::constants::lhc::LHCOrbitNS : 0;
     ns -= orb * o2::constants::lhc::LHCOrbitNS;
     return std::round(ns / o2::constants::lhc::LHCBunchSpacingNS);
   }
 
   void print() const;
 
-  ClassDefNV(InteractionRecord, 1);
+  ClassDefNV(InteractionRecord, 2);
 };
 }
 

DataFormats/common/src/InteractionRecord.cxx

@@ -14,7 +14,7 @@ namespace o2
 {
 void InteractionRecord::print() const
 {
-  std::cout << "BCid: " << bc << " Orbit: " << orbit << " Period: " << period << " T(ns): " << timeNS << std::endl;
+  std::cout << "BCid: " << bc << " Orbit: " << orbit << " T(ns): " << timeNS << std::endl;
 }
 
 } // namespace o2