dec: two latency vars, rew-decoder accessing ccdb

Author: lietava

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

@@ -24,9 +24,10 @@ namespace ctp
 struct TriggerOffsetsParam : public o2::conf::ConfigurableParamHelper<TriggerOffsetsParam> {
   static constexpr int MaxNDet = 32; // take with margin to account for possible changes / upgrades
   int64_t LM_L0 = 15;
-  int64_t L0_L1 = 280;
+  int64_t L0_L1_classes = 280; // trigger class latency
   int64_t globalInputsShift = 0; // Global shift of inps; customOffset[CTP] is global shift of classes
   int64_t customOffset[MaxNDet] = {};
+  int64_t L0_L1_inputs = 281; // trigger input latency
   O2ParamDef(TriggerOffsetsParam, "TriggerOffsetsParam"); // boilerplate stuff + make principal key
 };
 } // namespace ctp

Detectors/CTP/reconstruction/src/RawDataDecoder.cxx

@@ -89,7 +89,7 @@ int RawDataDecoder::addCTPDigit(uint32_t linkCRU, uint32_t orbit, gbtword80_t& d
     }
   } else if (linkCRU == o2::ctp::GBTLinkIDClassRec) {
     int32_t BCShiftCorrection = -o2::ctp::TriggerOffsetsParam::Instance().customOffset[o2::detectors::DetID::CTP];
-    int32_t offset = BCShiftCorrection + o2::ctp::TriggerOffsetsParam::Instance().LM_L0 + o2::ctp::TriggerOffsetsParam::Instance().L0_L1 - 1;
+    int32_t offset = BCShiftCorrection + o2::ctp::TriggerOffsetsParam::Instance().LM_L0 + o2::ctp::TriggerOffsetsParam::Instance().L0_L1_classes - 1;
     LOG(debug) << "tcr ir ori:" << ir;
     if ((ir.orbit <= mTFOrbit) && ((int32_t)ir.bc < offset)) {
       // LOG(warning) << "Loosing tclass:" << ir;
@@ -535,7 +535,7 @@ int RawDataDecoder::shiftInputs(std::map<o2::InteractionRecord, CTPDigit>& digit
   int nTwoIlost = 0;
   std::map<o2::InteractionRecord, CTPDigit> digitsMapShifted;
   auto L0shift = o2::ctp::TriggerOffsetsParam::Instance().LM_L0;
-  auto L1shift = L0shift + o2::ctp::TriggerOffsetsParam::Instance().L0_L1 + 1;
+  auto L1shift = L0shift + o2::ctp::TriggerOffsetsParam::Instance().L0_L1_inputs;
   for (auto const& dig : digitsMap) {
     auto inpmask = dig.second.CTPInputMask;
     auto inpmaskLM = inpmask & LMMASKInputs;

Detectors/CTP/workflow/src/RawDecoderSpec.cxx

@@ -209,6 +209,7 @@ o2::framework::DataProcessorSpec o2::ctp::reco_workflow::getRawDecoderSpec(bool
   std::vector<o2::framework::OutputSpec> outputs;
   if (digits) {
     inputs.emplace_back("ctpconfig", "CTP", "CTPCONFIG", 0, o2::framework::Lifetime::Condition, o2::framework::ccdbParamSpec("CTP/Config/Config", 1));
+    inputs.emplace_back("trigoffset", "CTP", "Trig_Offset", 0, o2::framework::Lifetime::Condition, o2::framework::ccdbParamSpec("CTP/Config/TriggerOffsets"));
     outputs.emplace_back("CTP", "DIGITS", 0, o2::framework::Lifetime::Timeframe);
   }
   if (lumi) {