Improve AggregatedRunInfo: prioritize use of CTP/Calib/FirstRunOrbit

use CTP/Calib/FirstRunOrbit when available. Otherwise fallback to
RunInformation.

DataFormats/Parameters/src/AggregatedRunInfo.cxx

@@ -50,5 +50,22 @@ o2::parameters::AggregatedRunInfo AggregatedRunInfo::buildAggregatedRunInfo(o2::
   // adjust to the nearest TF edge to satisfy condition (orbitSOR % nOrbitsPerTF == 0)
   orbitSOR = orbitSOR / nOrbitsPerTF * nOrbitsPerTF;
 
+  // fetch SOR directly from CTP entry on CCDB
+  bool oldFatalState = ccdb.getFatalWhenNull();
+  ccdb.setFatalWhenNull(false);
+  auto ctp_first_run_orbit = ccdb.getForTimeStamp<std::vector<int64_t>>("CTP/Calib/FirstRunOrbit", run_mid_timestamp);
+  ccdb.setFatalWhenNull(oldFatalState);
+  if (ctp_first_run_orbit) {
+    // if we have CTP first run orbit available, we should probably use it
+    int64_t ctp_orbitSOR = int64_t(((*ctp_first_run_orbit)[0] - tsOrbitReset) / o2::constants::lhc::LHCOrbitMUS);
+    ctp_orbitSOR = int64_t(ctp_orbitSOR / nOrbitsPerTF * nOrbitsPerTF); // align to timeframe boundary
+
+    // overwrite orbitSOR
+    orbitSOR = ctp_orbitSOR;
+
+    // overwrite SOR (otherwise inconsistent)
+    sor = (*ctp_first_run_orbit)[0] / 1000;
+  }
+
   return AggregatedRunInfo{runnumber, sor, eor, nOrbitsPerTF, tsOrbitReset, orbitSOR, orbitEOR};
 }