Retrieve original run number as FMQ property and store in Activity

Closes QC-1295

Author: knopers8

Framework/include/QualityControl/Activity.h

@@ -39,7 +39,8 @@ class Activity
            ValidityInterval validity = gFullValidityInterval,
            const std::string& beamType = "",
            const std::string& partitionName = "",
-           int fillNumber = 0)
+           int fillNumber = 0,
+           int originalId = 0)
     : mId(id),
       mType(type),
       mPeriodName(periodName),
@@ -48,7 +49,8 @@ class Activity
       mValidity(validity),
       mBeamType(beamType),
       mPartitionName(partitionName),
-      mFillNumber(fillNumber) {}
+      mFillNumber(fillNumber),
+      mOriginalId(originalId) {}
 
   /// Copy constructor
   Activity(const Activity& other) = default;
@@ -80,6 +82,7 @@ class Activity
   std::string mBeamType{};
   std::string mPartitionName{};
   int mFillNumber{ 0 };
+  int mOriginalId{ 0 }; // original run number of REPLAY runs
 
   ClassDef(Activity, 6);
 };

Framework/include/QualityControl/ActivityHelpers.h

@@ -115,6 +115,7 @@ Activity commonActivityFields(const RangeOfActivities auto& activities)
   setMemberIfCommon(result, activities, &Activity::mBeamType);
   setMemberIfCommon(result, activities, &Activity::mPartitionName);
   setMemberIfCommon(result, activities, &Activity::mFillNumber);
+  setMemberIfCommon(result, activities, &Activity::mOriginalId);
   return result;
 }
 

Framework/include/QualityControl/CommonSpec.h

@@ -38,6 +38,7 @@ struct CommonSpec {
   std::string activityBeamType;
   std::string activityPartitionName;
   int activityFillNumber = 0;
+  int activityOriginalNumber = 0;
   std::string monitoringUrl = "infologger:///debug?qc";
   std::string consulUrl;
   std::string conditionDBUrl = "http://ccdb-test.cern.ch:8080";

Framework/include/QualityControl/ObjectMetadataKeys.h

@@ -44,6 +44,7 @@ constexpr auto periodName = "PeriodName";
 constexpr auto beamType = "BeamType";
 constexpr auto fillNumber = "FillNumber";
 constexpr auto partitionName = "PartitionName";
+constexpr auto originalRunNumber = "OriginalRunNumber";
 
 } // namespace o2::quality_control::repository::metadata_keys
 

Framework/src/Activity.cxx

@@ -34,7 +34,8 @@ std::ostream& operator<<(std::ostream& out, const Activity& activity)
       << ", " << metadata_keys::validUntil << ": " << activity.mValidity.getMax()
       << ", " << metadata_keys::beamType << ": '" << activity.mBeamType << "'"
       << ", " << metadata_keys::partitionName << ": '" << activity.mPartitionName << "'"
-      << ", " << metadata_keys::fillNumber << ": '" << activity.mFillNumber << "'";
+      << ", " << metadata_keys::fillNumber << ": '" << activity.mFillNumber << "'"
+      << ", " << metadata_keys::originalRunNumber << ": '" << activity.mOriginalId << "'";
   return out;
 }
 
@@ -72,7 +73,8 @@ bool Activity::operator==(const Activity& other) const
          mPassName == other.mPassName &&
          mProvenance == other.mProvenance &&
          mValidity == other.mValidity &&
-         mBeamType == other.mBeamType;
+         mBeamType == other.mBeamType &&
+         mOriginalId == other.mOriginalId;
 }
 
 } // namespace o2::quality_control::core

Framework/src/AggregatorRunnerFactory.cxx

@@ -79,7 +79,8 @@ AggregatorRunnerConfig AggregatorRunnerFactory::extractRunnerConfig(const core::
     { commonSpec.activityStart, commonSpec.activityEnd },
     commonSpec.activityBeamType,
     commonSpec.activityPartitionName,
-    commonSpec.activityFillNumber
+    commonSpec.activityFillNumber,
+    commonSpec.activityOriginalNumber
   };
 
   return {

Framework/src/CheckRunnerFactory.cxx

@@ -88,7 +88,8 @@ CheckRunnerConfig CheckRunnerFactory::extractConfig(const CommonSpec& commonSpec
     { commonSpec.activityStart, commonSpec.activityEnd },
     commonSpec.activityBeamType,
     commonSpec.activityPartitionName,
-    commonSpec.activityFillNumber
+    commonSpec.activityFillNumber,
+    commonSpec.activityOriginalNumber
   };
   return {
     commonSpec.database,

Framework/src/InfrastructureSpecReader.cxx

@@ -68,6 +68,7 @@ CommonSpec InfrastructureSpecReader::readSpecEntry<CommonSpec>(const std::string
   spec.activityBeamType = commonTree.get<std::string>("Activity.beamType", spec.activityBeamType);
   spec.activityPartitionName = commonTree.get<std::string>("Activity.partitionName", spec.activityPartitionName);
   spec.activityFillNumber = commonTree.get<int>("Activity.fillNumber", spec.activityFillNumber);
+  spec.activityOriginalNumber = commonTree.get<int>("Activity.originalNumber", spec.activityOriginalNumber);
   spec.monitoringUrl = commonTree.get<std::string>("monitoring.url", spec.monitoringUrl);
   spec.consulUrl = commonTree.get<std::string>("consul.url", spec.consulUrl);
   spec.conditionDBUrl = commonTree.get<std::string>("conditionDB.url", spec.conditionDBUrl);

Framework/src/TaskRunnerFactory.cxx

@@ -162,7 +162,8 @@ TaskRunnerConfig TaskRunnerFactory::extractConfig(const CommonSpec& globalConfig
     { globalConfig.activityStart, globalConfig.activityEnd },
     globalConfig.activityBeamType,
     globalConfig.activityPartitionName,
-    globalConfig.activityFillNumber
+    globalConfig.activityFillNumber,
+    globalConfig.activityOriginalNumber
   };
 
   o2::globaltracking::RecoContainer rd;

Framework/src/runnerUtils.cxx

@@ -106,6 +106,7 @@ Activity computeActivity(framework::ServiceRegistryRef services, const Activity&
   auto periodName = computeStringActivityField(services, "lhc_period", fallbackActivity.mPeriodName);
   auto fillNumber = computeNumericalActivityField<int>(services, "fill_info_fill_number", fallbackActivity.mFillNumber);
   auto beam_type = computeStringActivityField(services, "pdp_beam_type", fallbackActivity.mBeamType);
+  auto originalRunNumber = computeNumericalActivityField<int>(services, "original_run_number", fallbackActivity.mOriginalId);
 
   Activity activity(
     runNumber,
@@ -116,7 +117,8 @@ Activity computeActivity(framework::ServiceRegistryRef services, const Activity&
     { runStartTimeMs, runEndTimeMs },
     beam_type,
     partitionName,
-    fillNumber);
+    fillNumber,
+    originalRunNumber);
 
   return activity;
 }