TRD: remove run number DPs CCDB upload

Author: leo-barreto

Detectors/TRD/calibration/include/TRDCalibration/DCSProcessor.h

@@ -63,14 +63,12 @@ class DCSProcessor
   bool updateVoltagesDPsCCDB();
   bool updateCurrentsDPsCCDB();
   bool updateEnvDPsCCDB();
-  bool updateRunDPsCCDB();
   // LB: new DPs for Fed
   bool updateFedChamberStatusDPsCCDB();
   bool updateFedCFGtagDPsCCDB();
 
   // signal that the CCDB object for the voltages should be updated due to change exceeding threshold
   bool shouldUpdateVoltages() const { return mShouldUpdateVoltages; }
-  bool shouldUpdateRun() const { return mShouldUpdateRun; }
   // LB: Only update ChamberStatus/CFGtag if both conditions are met (complete DPs and new run)
   bool shouldUpdateFedChamberStatus() const { return mFedChamberStatusCompleteDPs && mFirstRunEntryForFedChamberStatusUpdate; }
   bool shouldUpdateFedCFGtag() const { return mFedCFGtagCompleteDPs && mFirstRunEntryForFedCFGtagUpdate; }
@@ -91,14 +89,13 @@ class DCSProcessor
   CcdbObjectInfo& getccdbVoltagesDPsInfo() { return mCcdbVoltagesDPsInfo; }
   CcdbObjectInfo& getccdbCurrentsDPsInfo() { return mCcdbCurrentsDPsInfo; }
   CcdbObjectInfo& getccdbEnvDPsInfo() { return mCcdbEnvDPsInfo; }
-  CcdbObjectInfo& getccdbRunDPsInfo() { return mCcdbRunDPsInfo; }
   CcdbObjectInfo& getccdbFedChamberStatusDPsInfo() { return mCcdbFedChamberStatusDPsInfo; }
   CcdbObjectInfo& getccdbFedCFGtagDPsInfo() { return mCcdbFedCFGtagDPsInfo; }
+  
   const std::unordered_map<DPID, TRDDCSMinMaxMeanInfo>& getTRDGasDPsInfo() const { return mTRDDCSGas; }
   const std::unordered_map<DPID, float>& getTRDVoltagesDPsInfo() const { return mTRDDCSVoltages; }
   const std::unordered_map<DPID, TRDDCSMinMaxMeanInfo>& getTRDCurrentsDPsInfo() const { return mTRDDCSCurrents; }
   const std::unordered_map<DPID, TRDDCSMinMaxMeanInfo>& getTRDEnvDPsInfo() const { return mTRDDCSEnv; }
-  const std::unordered_map<DPID, int>& getTRDRunDPsInfo() const { return mTRDDCSRun; }
   const std::array<int, constants::MAXCHAMBER>& getTRDFedChamberStatusDPsInfo() const { return mTRDDCSFedChamberStatus; }
   const std::array<string, constants::MAXCHAMBER>& getTRDFedCFGtagDPsInfo() const { return mTRDDCSFedCFGtag; }
 
@@ -128,7 +125,6 @@ class DCSProcessor
   std::unordered_map<DPID, TRDDCSMinMaxMeanInfo> mTRDDCSCurrents; ///< anode and drift currents
   std::unordered_map<DPID, float> mTRDDCSVoltages;                ///< anode and drift voltages
   std::unordered_map<DPID, TRDDCSMinMaxMeanInfo> mTRDDCSEnv;      ///< environment parameters (temperatures, pressures, humidity)
-  std::unordered_map<DPID, int> mTRDDCSRun;                       ///< run number (run type ignored)
   // LB: new DPs for Fed
   std::array<int, constants::MAXCHAMBER> mTRDDCSFedChamberStatus; ///< fed chamber status
   std::array<string, constants::MAXCHAMBER> mTRDDCSFedCFGtag;     ///< fed config tag
@@ -140,7 +136,6 @@ class DCSProcessor
   CcdbObjectInfo mCcdbVoltagesDPsInfo;
   CcdbObjectInfo mCcdbCurrentsDPsInfo;
   CcdbObjectInfo mCcdbEnvDPsInfo;
-  CcdbObjectInfo mCcdbRunDPsInfo;
   // LB: new DPs for Fed
   CcdbObjectInfo mCcdbFedChamberStatusDPsInfo;
   CcdbObjectInfo mCcdbFedCFGtagDPsInfo;
@@ -149,8 +144,6 @@ class DCSProcessor
   TFType mVoltagesStartTS; ///< the time stamp of the first TF which was processesd for the current voltages CCDB object
   TFType mCurrentsStartTS; ///< the time stamp of the first TF which was processesd for the current voltages CCDB object
   TFType mEnvStartTS;
-  TFType mRunStartTS;
-  TFType mRunEndTS;
   // LB: new DPs for Fed
   TFType mFedChamberStatusStartTS;
   TFType mFedCFGtagStartTS;
@@ -159,13 +152,11 @@ class DCSProcessor
   bool mVoltagesStartTSSet{false};
   bool mCurrentsStartTSSet{false};
   bool mEnvStartTSSet{false};
-  bool mRunStartTSSet{false};
   // LB: new DPs for Fed
   bool mFedChamberStatusStartTSSet{false};
   bool mFedCFGtagStartTSSet{false};
   std::bitset<constants::MAXCHAMBER> mVoltageSet{};
   bool mShouldUpdateVoltages{false};
-  bool mShouldUpdateRun{false};
   // LB: FedChamberStatus and FedCFGtag logic
   bool mFedChamberStatusCompleteDPs{false};
   bool mFedCFGtagCompleteDPs{false};

Detectors/TRD/calibration/src/DCSProcessor.cxx

@@ -198,32 +198,21 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
 
     if (type == DPVAL_INT) {
       if (std::strstr(dpid.get_alias(), "trd_fed_runNo") != nullptr) { // DP is trd_fed_runNo
-        if (!mRunStartTSSet) {
-          mRunStartTS = mCurrentTS;
-          mRunStartTSSet = true;
-        }
-
-        auto& runNumber = mTRDDCSRun[dpid];
-
         // LB: Check if new value is a valid run number (0 = cleared variable)
         if (o2::dcs::getValue<int32_t>(dpcom) > 0) {
           // If value has changed from previous one, new run has begun and update
           if (o2::dcs::getValue<int32_t>(dpcom) != mCurrentRunNumber) {
             LOG(info) << "New run number " << o2::dcs::getValue<int32_t>(dpcom) << " differs from the old one " << mCurrentRunNumber;
-            mShouldUpdateRun = true;
             // LB: two different flags as they reset separately, after upload of CCDB, for each object
             mFirstRunEntryForFedChamberStatusUpdate = true;
             mFirstRunEntryForFedCFGtagUpdate = true;
             // LB: reset alarm counters
             mFedChamberStatusAlarmCounter = 0;
             mFedCFGtagAlarmCounter = 0;
-            mRunEndTS = mCurrentTS;
           }
 
           // LB: Save current run number
           mCurrentRunNumber = o2::dcs::getValue<int32_t>(dpcom);
-          // Save to mTRDDCSRun
-          runNumber = mCurrentRunNumber;
         }
 
         if (mVerbosity > 2) {
@@ -476,38 +465,6 @@ bool DCSProcessor::updateEnvDPsCCDB()
   return retVal;
 }
 
-bool DCSProcessor::updateRunDPsCCDB()
-{
-  // here we create the object containing the run data points to then be sent to CCDB
-  LOG(info) << "Preparing CCDB object for TRD run DPs";
-
-  bool retVal = false; // set to 'true' in case at least one DP for run has been processed
-
-  for (const auto& it : mPids) {
-    const auto& type = it.first.get_type();
-    if (type == o2::dcs::DPVAL_INT) {
-      if (std::strstr(it.first.get_alias(), "trd_fed_run") != nullptr) {
-        if (it.second == true) { // we processed the DP at least 1x
-          retVal = true;
-        }
-        if (mVerbosity > 0) {
-          LOG(info) << "PID = " << it.first.get_alias() << ". Value = " << mTRDDCSRun[it.first];
-        }
-      }
-    }
-  }
-  std::map<std::string, std::string> md;
-  md["responsible"] = "Leonardo Barreto";
-  // Redundancy for testing, this object is updated after run ended, so need to write old run number, not current
-  // md["runNumber"] = std::to_string(mFinishedRunNumber);
-  o2::calibration::Utils::prepareCCDBobjectInfo(mTRDDCSRun, mCcdbRunDPsInfo, "TRD/Calib/DCSDPsRun", md, mRunStartTS, mRunEndTS);
-
-  // LB: Deactivated upload of Run DPs to CCDB even if processed
-  // To turn it back on just comment the next line
-  retVal = false;
-  return retVal;
-}
-
 bool DCSProcessor::updateFedChamberStatusDPsCCDB()
 {
   // here we create the object containing the fedChamberStatus data points to then be sent to CCDB
@@ -637,22 +594,6 @@ void DCSProcessor::clearEnvDPsInfo()
   }
 }
 
-void DCSProcessor::clearRunDPsInfo()
-{
-  mTRDDCSRun.clear();
-  mRunStartTSSet = false;
-  mShouldUpdateRun = false;
-  // reset the 'processed' flags for the run DPs
-  for (auto& it : mPids) {
-    const auto& type = it.first.get_type();
-    if (type == o2::dcs::DPVAL_INT) {
-      if (std::strstr(it.first.get_alias(), "trd_fed_run") != nullptr) {
-        it.second = false;
-      }
-    }
-  }
-}
-
 void DCSProcessor::clearFedChamberStatusDPsInfo()
 {
   // mTRDDCSFedChamberStatus should not be cleared after upload giving alarm/warn logic

Detectors/TRD/calibration/workflow/TRDDCSDataProcessorSpec.h

@@ -209,11 +209,9 @@ class TRDDCSDataProcessor : public o2::framework::Task
     if (mProcessor->shouldUpdateFedCFGtag()) {
       sendDPsoutputFedCFGtag(pc.outputs());
     }
-
-    if (mProcessor->shouldUpdateRun()) {
-      sendDPsoutputRun(pc.outputs());
-    }
+    
     sw.Stop();
+
     if (mReportTiming) {
       LOGP(info, "Timing CPU:{:.3e} Real:{:.3e} at slice {}", sw.CpuTime(), sw.RealTime(), pc.services().get<o2::framework::TimingInfo>().timeslice);
     }
@@ -225,7 +223,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     sendDPsoutputVoltages(ec.outputs());
     sendDPsoutputCurrents(ec.outputs());
     sendDPsoutputEnv(ec.outputs());
-    sendDPsoutputRun(ec.outputs());
     // LB: new DPs for Fed
     sendDPsoutputFedChamberStatus(ec.outputs());
     sendDPsoutputFedCFGtag(ec.outputs());
@@ -325,26 +322,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     }
   }
 
-  //________________________________________________________________
-  void sendDPsoutputRun(DataAllocator& output)
-  {
-    // extract CCDB infos and calibration object for DPs
-    if (mProcessor->updateRunDPsCCDB()) {
-      const auto& payload = mProcessor->getTRDRunDPsInfo();
-      auto& info = mProcessor->getccdbRunDPsInfo();
-      auto image = o2::ccdb::CcdbApi::createObjectImage(&payload, &info);
-      LOG(info) << "Sending object " << info.getPath() << "/" << info.getFileName() << " of size " << image->size()
-                << " bytes, valid for " << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
-      output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSRunDPs", 0}, *image.get());
-      output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_DCSRunDPs", 0}, info);
-      mProcessor->clearRunDPsInfo();
-    } else {
-      auto& info = mProcessor->getccdbRunDPsInfo();
-      // LOG(info) << "Not sending object " << info.getPath() << "/" << info.getFileName() << " since no DPs were processed for it";
-      LOG(info) << "Not sending object " << info.getPath() << "/" << info.getFileName() << " as upload of Run DPs was deactivated";
-    }
-  }
-
   // LB: new DP for FedChamberStatus
   //________________________________________________________________
   void sendDPsoutputFedChamberStatus(DataAllocator& output)
@@ -395,7 +372,7 @@ DataProcessorSpec getTRDDCSDataProcessorSpec()
 {
 
   std::vector<OutputSpec> outputs;
-
+   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_ChamberStat"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSGasDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_DCSGasDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSUDPs"});