Merge 10aa18a into sapling-pr-archive-ktf

Author: ktf

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

@@ -162,6 +162,7 @@ class CTPConfiguration
   int getInputIndex(const std::string& name) const;
   std::string getClassNameFromIndex(int index) { return mCTPClasses[index].name; };
   std::string getClassNameFromHWIndex(int index);
+  const CTPClass* getCTPClassFromHWIndex(const int index) const;
   bool isMaskInInputs(const uint64_t& mask) const;
   bool isBCMaskInConfig(const std::string maskname) const;
   const BCMask* isBCMaskInConfigP(const std::string bcmask) const;

DataFormats/Detectors/CTP/src/Configuration.cxx

@@ -790,6 +790,17 @@ std::string CTPConfiguration::getClassNameFromHWIndex(int index)
   std::string ret = "not found";
   return ret;
 }
+const CTPClass* CTPConfiguration::getCTPClassFromHWIndex(int index) const
+{
+  const CTPClass* clsfound = nullptr;
+  for (auto const& cls : mCTPClasses) {
+    if (index == cls.getIndex()) {
+      clsfound = &cls;
+      break;
+    }
+  }
+  return clsfound;
+}
 bool CTPConfiguration::isMaskInInputs(const uint64_t& mask) const
 {
   for (auto const& inp : mInputs) {

DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/DsChannelId.h

@@ -61,5 +61,13 @@ class DsChannelId
 
   ClassDefNV(DsChannelId, 1); // class for MCH readout channel
 };
+
+inline bool operator==(const DsChannelId& a, const DsChannelId& b) { return a.value() == b.value(); }
+inline bool operator!=(const DsChannelId& a, const DsChannelId& b) { return !(a == b); }
+inline bool operator<(const DsChannelId& a, const DsChannelId& b) { return a.value() < b.value(); }
+inline bool operator>(const DsChannelId& a, const DsChannelId& b) { return b < a; }
+inline bool operator<=(const DsChannelId& a, const DsChannelId& b) { return !(a > b); }
+inline bool operator>=(const DsChannelId& a, const DsChannelId& b) { return !(a < b); }
+
 } // namespace o2::mch
 #endif

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

@@ -45,6 +45,7 @@ class RawDataDecoder
   void setMAXErrors(int m) { mErrorMax = m; }
   int setLumiInp(int lumiinp, std::string inp);
   void setCTPConfig(CTPConfiguration cfg) { mCTPConfig = std::move(cfg); };
+  void setCheckConsistency(bool check) { mCheckConsistency = check; }
   uint32_t getIRRejected() const { return mIRRejected; }
   uint32_t getTCRRejected() const { return mTCRRejected; }
   std::vector<uint32_t>& getTFOrbits() { return mTFOrbits; }
@@ -54,12 +55,14 @@ class RawDataDecoder
   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);
+  int checkReadoutConsistentncy(o2::pmr::vector<CTPDigit>& digits, uint64_t trgclassmask = 0xffffffffffffffff);
 
  private:
   static constexpr uint32_t TF_TRIGGERTYPE_MASK = 0x800;
   static constexpr uint32_t HB_TRIGGERTYPE_MASK = 0x2;
   // true: full inps decoding includine latency shifts here; false: latency shifts in CTF decoder
   bool mDecodeInps = false;
+  bool mCheckConsistency = false;
   // for digits
   bool mDoDigits = true;
   std::vector<CTPDigit> mOutputDigits;

Detectors/CTP/reconstruction/src/RawDataDecoder.cxx

@@ -79,13 +79,13 @@ int RawDataDecoder::addCTPDigit(uint32_t linkCRU, uint32_t orbit, gbtword80_t& d
         if (mErrorIR < mErrorMax) {
           LOG(error) << "Two CTP IRs with the same timestamp:" << ir.bc << " " << ir.orbit << " pld:" << pld << " dig:" << digits[ir];
         }
-        ret = 2;
+        ret = 4;
         mErrorIR++;
         mStickyError = true;
       }
     } else {
       LOG(error) << "Two digits with the same timestamp:" << ir.bc << " " << ir.orbit;
-      ret = 2;
+      ret = 8;
     }
   } else if (linkCRU == o2::ctp::GBTLinkIDClassRec) {
     int32_t BCShiftCorrection = -o2::ctp::TriggerOffsetsParam::Instance().customOffset[o2::detectors::DetID::CTP];
@@ -113,11 +113,11 @@ int RawDataDecoder::addCTPDigit(uint32_t linkCRU, uint32_t orbit, gbtword80_t& d
           mStickyError = true;
         }
         mErrorTCR++;
-        ret = 3;
+        ret = 16;
       }
     } else {
       LOG(error) << "Two digits with the same timestamp:" << ir.bc << " " << ir.orbit;
-      ret = 3;
+      ret = 32;
     }
   } else {
     LOG(error) << "Unxpected  CTP CRU link:" << linkCRU;
@@ -298,7 +298,10 @@ int RawDataDecoder::decodeRaw(o2::framework::InputRecord& inputs, std::vector<o2
       trgclassmask = mCTPConfig.getTriggerClassMask();
     }
     // std::cout << "trgclassmask:" << std::hex << trgclassmask << std::dec << std::endl;
-    shiftInputs(digitsMap, digits, mTFOrbit, trgclassmask);
+    ret = shiftInputs(digitsMap, digits, mTFOrbit, trgclassmask);
+    if (mCheckConsistency) {
+      ret = checkReadoutConsistentncy(digits, trgclassmask);
+    }
   }
   if (mDoDigits && !mDecodeInps) {
     for (auto const& dig : digitsMap) {
@@ -615,13 +618,58 @@ int RawDataDecoder::shiftInputs(std::map<o2::InteractionRecord, CTPDigit>& digit
     }
     digits.push_back(dig.second);
   }
+  int ret = 0;
   if (nTwoI) { // Trigger class wo Input
     LOG(error) << "LM:" << nLM << " L0:" << nL0 << " L1:" << nL1 << " TwI:" << nTwI << " Trigger classes wo input:" << nTwoI;
+    ret = 64;
   }
   if (nTwoIlost) {
     LOG(warn) << " Trigger classes wo input from diff latency 1:" << nTwoIlost;
   }
-  return 0;
+  return ret;
+}
+//
+int RawDataDecoder::checkReadoutConsistentncy(o2::pmr::vector<CTPDigit>& digits, uint64_t trgclassmask)
+{
+  int ret = 0;
+  int lost = 0;
+  for (auto const& digit : digits) {
+    // if class mask => inps
+    for (int i = 0; i < digit.CTPClassMask.size(); i++) {
+      if (digit.CTPClassMask[i]) {
+        const CTPClass* cls = mCTPConfig.getCTPClassFromHWIndex(i);
+        uint64_t clsinpmask = cls->descriptor->getInputsMask();
+        uint64_t diginpmask = digit.CTPInputMask.to_ullong();
+        if (!((clsinpmask & diginpmask) == clsinpmask)) {
+          LOG(error) << "CTP class:" << cls->name << " inpmask:" << clsinpmask << " not compatible with inputs mask:" << diginpmask;
+          ret = 128;
+        }
+      }
+    }
+    // if inps => class mask
+    for (auto const& cls : mCTPConfig.getCTPClasses()) {
+      uint64_t clsinpmask = cls.descriptor->getInputsMask();
+      uint64_t diginpmask = digit.CTPInputMask.to_ullong();
+      uint64_t digclsmask = digit.CTPClassMask.to_ullong();
+      if ((clsinpmask & diginpmask) == clsinpmask) {
+        if ((cls.classMask & digclsmask) == 0) {
+          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_classes - 1;
+          offset = o2::constants::lhc::LHCMaxBunches - offset;
+          if (digit.intRecord.bc < offset) {
+            LOG(error) << "CTP class:" << cls.name << " inpmask:" << clsinpmask << " cls mask:" << cls.classMask << " not found in digit:" << digit;
+            ret = 256;
+          } else {
+            lost++;
+          }
+        }
+      }
+    }
+  }
+  if (lost) {
+    LOG(info) << "LOST classes because of shift:" << lost;
+  }
+  return ret;
 }
 //
 int RawDataDecoder::setLumiInp(int lumiinp, std::string inp)

Detectors/CTP/workflow/src/RawDecoderSpec.cxx

@@ -201,9 +201,9 @@ o2::framework::DataProcessorSpec o2::ctp::reco_workflow::getRawDecoderSpec(bool
   }
 
   std::vector<o2::framework::OutputSpec> outputs;
+  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"));
   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) {
@@ -230,12 +230,10 @@ 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();
-      }
+    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();
     }
   }
 }

Detectors/CTP/workflowScalers/src/ctp-ccdb-orbit.cxx

@@ -76,6 +76,7 @@ int main(int argc, char** argv)
     std::cerr << e.what() << ", application will now exit" << std::endl;
     exit(2);
   }
+  int ret = 0;
   std::string action = vm["action"].as<std::string>();
   std::vector<int64_t> vect;
   std::string ccdbPath;
@@ -120,10 +121,10 @@ int main(int argc, char** argv)
       int64_t runnum = vm["run-number"].as<int64_t>();
       metadata["runNumber"] = std::to_string(runnum);
       std::cout << "Storing:" << ccdbPath << " " << metadata["runNumber"] << " tmin:" << tmin << " tmax:" << tmax << " ts:" << tt << std::endl;
-      api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
+      ret = api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
     } else {
       std::cout << "Storing:" << ccdbPath << " tmin:" << tmin << " tmax:" << tmax << " ts:" << tt << std::endl;
-      api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
+      ret = api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
     }
   }
   //
@@ -132,7 +133,7 @@ int main(int argc, char** argv)
     TFile* f = TFile::Open(file.c_str(), "RECREATE");
     if (f == nullptr) {
       std::cout << "Error: File" << file << " could not be open for writing !!!" << std::endl;
-      return 1;
+      ret++;
     } else {
       std::cout << "File" << file << " being writen." << std::endl;
       f->WriteObject(&vect, "ccdb_object");
@@ -141,5 +142,5 @@ int main(int argc, char** argv)
   } else {
     std::cout << "No file created" << std::endl;
   }
-  return 0;
+  return ret;
 }

Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx

@@ -83,6 +83,8 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc)
       } else {
         LOG(info) << "Sending an object to Production-CCDB and DCS-CCDB";
         sendOutputCcdbDcs(pc.outputs());
+        LOG(info) << "Sending an object to Production-CCDBMerge";
+        sendOutputCcdbMerge(pc.outputs());
       }
       pc.services().get<ControlService>().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All);
     }
@@ -105,6 +107,8 @@ void NoiseCalibratorSpec::run(ProcessingContext& pc)
       } else {
         LOG(info) << "Sending an object to Production-CCDB and DCS-CCDB";
         sendOutputCcdbDcs(pc.outputs());
+        LOG(info) << "Sending an object to Production-CCDBMerge";
+        sendOutputCcdbMerge(pc.outputs());
       }
       pc.services().get<ControlService>().readyToQuit(mStopMeOnly ? QuitRequest::Me : QuitRequest::All);
     }

Detectors/MUON/MCH/Conditions/src/bad-channels-ccdb.cxx

@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include <boost/program_options.hpp>
+#include <algorithm>
 #include <ctime>
 #include <fstream>
 #include <iterator>
@@ -209,9 +210,12 @@ void uploadBadChannels(const std::string ccdbUrl,
                        const std::string badChannelType,
                        uint64_t startTimestamp,
                        uint64_t endTimestamp,
-                       const BadChannelsVector& bv,
+                       BadChannelsVector& bv,
                        bool makeDefault)
 {
+  std::sort(bv.begin(), bv.end());
+  bv.erase(std::unique(bv.begin(), bv.end()), bv.end());
+
   std::cout << std::endl;
   o2::ccdb::CcdbApi api;
   api.init(ccdbUrl);

Detectors/MUON/MCH/DigitFiltering/CMakeLists.txt

@@ -13,6 +13,8 @@ o2_add_library(MCHDigitFiltering
         SOURCES
           src/DigitFilter.cxx
           src/DigitFilterParam.cxx
+          src/DigitModifier.cxx
+          src/DigitModifierParam.cxx
           src/DigitFilteringSpec.cxx
         PUBLIC_LINK_LIBRARIES
           O2::Framework
@@ -27,4 +29,4 @@ o2_add_executable(
         COMPONENT_NAME mch
         PUBLIC_LINK_LIBRARIES O2::MCHDigitFiltering)
 
-o2_target_root_dictionary(MCHDigitFiltering HEADERS include/MCHDigitFiltering/DigitFilterParam.h)
+o2_target_root_dictionary(MCHDigitFiltering HEADERS include/MCHDigitFiltering/DigitFilterParam.h include/MCHDigitFiltering/DigitModifierParam.h)