dev: config done only if run changed

Author: lietava

Detectors/CTP/reconstruction/include/CTPReconstruction/CTFCoder.h

@@ -56,6 +56,7 @@ class CTFCoder : public o2::ctf::CTFCoderBase
   void setDecodeInps(bool decodeinps) { mDecodeInps = decodeinps; }
   void setCTPConfig(CTPConfiguration cfg) { mCTPConfig = std::move(cfg); }
   bool getDecodeInps() { return mDecodeInps; }
+  CTPConfiguration& getCTPConfig() { return mCTPConfig; }
   bool canApplyBCShiftInputs(const o2::InteractionRecord& ir) const { return canApplyBCShift(ir, mBCShiftInputs); }
 
  private:

Detectors/CTP/reconstruction/include/CTPReconstruction/RawDataDecoder.h

@@ -50,6 +50,7 @@ class RawDataDecoder
   std::vector<uint32_t>& getTFOrbits() { return mTFOrbits; }
   int getErrorIR() { return mErrorIR; }
   int getErrorTCR() { return mErrorTCR; }
+  CTPConfiguration& getCTPConfig() { return mCTPConfig; }
   int init();
   static int shiftNew(const o2::InteractionRecord& irin, uint32_t TFOrbit, std::bitset<48>& inpmask, int64_t shift, int level, std::map<o2::InteractionRecord, CTPDigit>& digmap);
   static int shiftInputs(std::map<o2::InteractionRecord, CTPDigit>& digitsMap, o2::pmr::vector<CTPDigit>& digits, uint32_t TFOrbit, uint64_t trgclassmask = 0xffffffffffffffff);

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

@@ -34,6 +34,7 @@ class EntropyDecoderSpec : public o2::framework::Task
   void init(o2::framework::InitContext& ic) final;
   void endOfStream(o2::framework::EndOfStreamContext& ec) final;
   void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj) final;
+  void updateTimeDependentParams(framework::ProcessingContext& pc);
 
  private:
   o2::ctp::CTFCoder mCTFCoder;

Detectors/CTP/workflow/src/EntropyDecoderSpec.cxx

@@ -55,22 +55,14 @@ void EntropyDecoderSpec::run(ProcessingContext& pc)
   mTimer.Start(false);
   o2::ctf::CTFIOSize iosize;
 
-  mCTFCoder.updateTimeDependentParams(pc, true);
+  updateTimeDependentParams(pc);
   auto buff = pc.inputs().get<gsl::span<o2::ctf::BufferType>>("ctf_CTP");
-
-  const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
   auto& digits = pc.outputs().make<std::vector<CTPDigit>>(OutputRef{"digits"});
   auto& lumi = pc.outputs().make<LumiInfo>(OutputRef{"CTPLumi"});
 
   // since the buff is const, we cannot use EncodedBlocks::relocate directly, instead we wrap its data to another flat object
   if (buff.size()) {
     const auto ctfImage = o2::ctp::CTF::getImage(buff.data());
-    if (mCTFCoder.getDecodeInps()) {
-      const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
-      if (ctpcfg != nullptr) {
-        mCTFCoder.setCTPConfig(*ctpcfg);
-      }
-    }
     iosize = mCTFCoder.decode(ctfImage, digits, lumi);
   }
   pc.outputs().snapshot({"ctfrep", 0}, iosize);
@@ -83,6 +75,20 @@ void EntropyDecoderSpec::endOfStream(EndOfStreamContext& ec)
   LOGF(info, "CTP Entropy Decoding total timing: Cpu: %.3e Real: %.3e s in %d slots",
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
+void EntropyDecoderSpec::updateTimeDependentParams(framework::ProcessingContext& pc)
+{
+  mCTFCoder.updateTimeDependentParams(pc, true);
+  if (pc.services().get<o2::framework::TimingInfo>().globalRunNumberChanged) {
+    const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
+    if (mCTFCoder.getDecodeInps()) {
+      const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
+      if (ctpcfg != nullptr) {
+        mCTFCoder.setCTPConfig(*ctpcfg);
+        LOG(info) << "ctpconfig for run done:" << mCTFCoder.getCTPConfig().getRunNumber();
+      }
+    }
+  }
+}
 
 DataProcessorSpec getEntropyDecoderSpec(int verbosity, unsigned int sspec)
 {

Detectors/CTP/workflow/src/RawDecoderSpec.cxx

@@ -137,13 +137,6 @@ void RawDecoderSpec::run(framework::ProcessingContext& ctx)
   if (fatal_flag) {
     ret = mDecoder.decodeRawFatal(inputs, filter);
   } else {
-    if (mDecodeinputs) {
-      const auto ctpcfg = inputs.get<o2::ctp::CTPConfiguration*>("ctpconfig");
-      if (ctpcfg != nullptr) {
-        mDecoder.setCTPConfig(*ctpcfg);
-      }
-    }
-    const auto& trigOffsParam = o2::ctp::TriggerOffsetsParam::Instance();
     ret = mDecoder.decodeRaw(inputs, filter, mOutputDigits, lumiPointsHBF1);
   }
   if (ret == 1) {
@@ -237,5 +230,12 @@ void RawDecoderSpec::updateTimeDependentParams(framework::ProcessingContext& pc)
     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;
+    if (mDecodeinputs) {
+      const auto ctpcfg = pc.inputs().get<o2::ctp::CTPConfiguration*>("ctpconfig");
+      if (ctpcfg != nullptr) {
+        mDecoder.setCTPConfig(*ctpcfg);
+        LOG(info) << "ctpconfig for run done:" << mDecoder.getCTPConfig().getRunNumber();
+      }
+    }
   }
 }