TRD: new run for update ChamberStatus/CFGtag flag divided in two variables, reset after ChamberStatus/CFGtag update

Author: leo-barreto

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

@@ -74,8 +74,8 @@ class DCSProcessor
   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 mShouldUpdateFedChamberStatus && mShouldUpdateRun; }
-  bool shouldUpdateFedCFGtag() const { return mShouldUpdateFedCFGtag && mShouldUpdateRun; }
+  bool shouldUpdateFedChamberStatus() const { return mFedChamberStatusCompleteDPs && mNewRunForFedChamberStatusUpdate; }
+  bool shouldUpdateFedCFGtag() const { return mFedCFGtagCompleteDPs && mNewRunForFedCFGtagUpdate; }
 
   // allow access to the CCDB objects from DPL processor
   CcdbObjectInfo& getccdbGasDPsInfo() { return mCcdbGasDPsInfo; }
@@ -171,8 +171,10 @@ class DCSProcessor
   bool mShouldUpdateVoltages{false};
   bool mShouldUpdateRun{false};
   // LB: FedChamberStatus and FedCFGtag logic
-  bool mShouldUpdateFedChamberStatus{false};
-  bool mShouldUpdateFedCFGtag{false};
+  bool mFedChamberStatusCompleteDPs{false};
+  bool mFedCFGtagCompleteDPs{false};
+  bool mNewRunForFedChamberStatusUpdate{false};
+  bool mNewRunForFedCFGtagUpdate{false};
   int mCurrentRunNumber{-1};
   int mFedChamberStatusAlarmCounter{0};
   int mFedCFGtagAlarmCounter{0};

Detectors/TRD/calibration/src/DCSProcessor.cxx

@@ -78,14 +78,14 @@ int DCSProcessor::process(const gsl::span<const DPCOM> dps)
   int ChamberStatusUniqueDPsCounter = std::distance(allChamberStatusDPsid.begin(), ChamberStatusUniqueIterator);
   int CFGtagUniqueDPsCounter = std::distance(allCFGtagDPsid.begin(), CFGtagUniqueIterator);
   if (ChamberStatusUniqueDPsCounter >= mFedMinimunDPsForUpdate) {
-    mShouldUpdateFedChamberStatus = true;
+    mFedChamberStatusCompleteDPs = true;
     if (mVerbosity > 1) {
       LOG(info) << "Minimum number of required DPs (" << mFedMinimunDPsForUpdate << ") for ChamberStatus update were found.";
     }
   }
 
   if (CFGtagUniqueDPsCounter >= mFedMinimunDPsForUpdate) {
-    mShouldUpdateFedCFGtag = true;
+    mFedCFGtagCompleteDPs = true;
     if (mVerbosity > 1) {
       LOG(info) << "Minimum number of required DPs (" << mFedMinimunDPsForUpdate << ") for CFGtag update were found.";
     }
@@ -245,6 +245,9 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
           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
+            mNewRunForFedChamberStatusUpdate = true;
+            mNewRunForFedCFGtagUpdate = true;
             mRunEndTS = mCurrentTS;
           }
 
@@ -268,7 +271,7 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
         if (etime != mLastDPTimeStamps[dpid]) {
           if (dpInfoFedChamberStatus != o2::dcs::getValue<int>(dpcom)) {
             // If value changes after processing and DPs should not be updated, log change as warning (for now)
-            if (mPids[dpid] && !(mShouldUpdateFedChamberStatus && mShouldUpdateRun)) {
+            if (mPids[dpid] && !(mFedChamberStatusCompleteDPs && mNewRunForFedChamberStatusUpdate)) {
               // Issue an alarm if counter is lower than maximum, warning otherwise
               if (mFedChamberStatusAlarmCounter < mFedAlarmCounterMax) {
                 LOG(alarm) << "ChamberStatus change " << dpid.get_alias() << " : " << dpInfoFedChamberStatus << " -> " << o2::dcs::getValue<int>(dpcom) << ", run = " << mCurrentRunNumber;
@@ -296,7 +299,7 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
         if (etime != mLastDPTimeStamps[dpid]) {
           if (dpInfoFedCFGtag != o2::dcs::getValue<string>(dpcom)) {
             // If value changes after processing and DPs should not be updated, log change as warning (for now)
-            if (mPids[dpid] && !(mShouldUpdateFedCFGtag && mShouldUpdateRun)) {
+            if (mPids[dpid] && !(mFedCFGtagCompleteDPs && mNewRunForFedCFGtagUpdate)) {
               // Issue an alarm if counter is lower than maximum, warning otherwise
               if (mFedCFGtagAlarmCounter < mFedAlarmCounterMax) {
                 LOG(alarm) << "CFGtag change " << dpid.get_alias() << " : " << dpInfoFedCFGtag << " -> " << o2::dcs::getValue<string>(dpcom) << ", run = " << mCurrentRunNumber;
@@ -568,9 +571,6 @@ bool DCSProcessor::updateFedCFGtagDPsCCDB()
 
   bool retVal = false; // set to 'true' in case at least one DP for run has been processed
 
-  // Once updated, do not update again until new run
-  // mShouldUpdateFedCFGtag = false;
-
   for (const auto& it : mPids) {
     const auto& type = it.first.get_type();
     if (type == o2::dcs::DPVAL_STRING) {
@@ -738,7 +738,8 @@ void DCSProcessor::clearFedChamberStatusDPsInfo()
 {
   mTRDDCSFedChamberStatus.clear();
   mFedChamberStatusStartTSSet = false;
-  mShouldUpdateFedChamberStatus = false;
+  mFedChamberStatusCompleteDPs = false;
+  mNewRunForFedChamberStatusUpdate = false;
   mFedChamberStatusAlarmCounter = 0;
   // reset the 'processed' flags for the fed DPs
   for (auto& it : mPids) {
@@ -755,7 +756,8 @@ void DCSProcessor::clearFedCFGtagDPsInfo()
 {
   mTRDDCSFedCFGtag.clear();
   mFedCFGtagStartTSSet = false;
-  mShouldUpdateFedCFGtag = false;
+  mFedChamberStatusCompleteDPs = false;
+  mNewRunForFedChamberStatusUpdate = false;
   mFedCFGtagAlarmCounter = 0;
   // reset the 'processed' flags for the fed DPs
   for (auto& it : mPids) {