dev: reading of CCDB offset paraams in rawdatadecoder

Author: lietava

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

@@ -24,10 +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;           // trigger class latency
+  int64_t L0_L1 = 281;           // trigger input 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
+  int64_t L0_L1_classes = 280;                             // 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_inputs;
+  auto L1shift = L0shift + o2::ctp::TriggerOffsetsParam::Instance().L0_L1;
   for (auto const& dig : digitsMap) {
     auto inpmask = dig.second.CTPInputMask;
     auto inpmaskLM = inpmask & LMMASKInputs;

Detectors/CTP/workflow/include/CTPWorkflow/RawDecoderSpec.h

@@ -16,6 +16,7 @@
 #include <deque>
 #include "Framework/DataProcessorSpec.h"
 #include "Framework/Task.h"
+#include "Framework/WorkflowSpec.h"
 #include "DataFormatsCTP/Digits.h"
 #include "DataFormatsCTP/LumiInfo.h"
 #include "CTPReconstruction/RawDataDecoder.h"
@@ -50,7 +51,7 @@ class RawDecoderSpec : public framework::Task
   /// Input RawData: {"ROUT", "RAWDATA", 0, Lifetime::Timeframe}
   /// Output HW errors: {"CTP", "RAWHWERRORS", 0, Lifetime::Timeframe} -later
   void run(framework::ProcessingContext& ctx) final;
-
+  void updateTimeDependentParams(framework::ProcessingContext& pc);
  protected:
  private:
   // for digits

Detectors/CTP/workflow/src/RawDecoderSpec.cxx

@@ -13,7 +13,6 @@
 #include <fairlogger/Logger.h>
 #include "Framework/InputRecordWalker.h"
 #include "Framework/DataRefUtils.h"
-#include "Framework/WorkflowSpec.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "DetectorsRaw/RDHUtils.h"
 #include "CTPWorkflow/RawDecoderSpec.h"
@@ -75,6 +74,7 @@ void RawDecoderSpec::endOfStream(framework::EndOfStreamContext& ec)
 }
 void RawDecoderSpec::run(framework::ProcessingContext& ctx)
 {
+  updateTimeDependentParams(ctx);
   mOutputDigits.clear();
   std::map<o2::InteractionRecord, CTPDigit> digits;
   using InputSpec = o2::framework::InputSpec;
@@ -143,6 +143,7 @@ void RawDecoderSpec::run(framework::ProcessingContext& ctx)
         mDecoder.setCTPConfig(*ctpcfg);
       }
     }
+    const auto& trigOffsParam = o2::ctp::TriggerOffsetsParam::Instance();
     ret = mDecoder.decodeRaw(inputs, filter, mOutputDigits, lumiPointsHBF1);
   }
   if (ret == 1) {
@@ -230,3 +231,11 @@ o2::framework::DataProcessorSpec o2::ctp::reco_workflow::getRawDecoderSpec(bool
       {"max-input-size-fatal", o2::framework::VariantType::Bool, false, {"If true issue fatal error otherwise error on;y"}},
       {"ctpinputs-decoding", o2::framework::VariantType::Bool, false, {"Inputs alignment: true - raw decoder - has to be compatible with CTF decoder: allowed options: 10,01,00"}}}};
 }
+ void RawDecoderSpec::updateTimeDependentParams(framework::ProcessingContext& pc)
+ {
+  if (pc.services().get<o2::framework::TimingInfo>().globalRunNumberChanged) {
+    pc.inputs().get<o2::ctp::TriggerOffsetsParam*>("trigoffset");
+    const auto& trigOffsParam = o2::ctp::TriggerOffsetsParam::Instance();
+    LOG(info) << "updateing TroggerOffsetsParam: inputs L0_L1:" << trigOffsParam.L0_L1 << " classes L0_L1:" << trigOffsParam.L0_L1_classes; 
+  }
+ }