TRD: assumed no duplicated DPs in Processor, changed variable names

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

Detectors/TRD/calibration/src/DCSProcessor.cxx

@@ -43,57 +43,49 @@ int DCSProcessor::process(const gsl::span<const DPCOM> dps)
     LOG(info) << "\n\n\nProcessing new TF\n-----------------";
   }
 
-  if (mVerbosity > 1) {
-    std::unordered_map<DPID, DPVAL> mapin;
-    for (auto& it : dps) {
-      mapin[it.id] = it.data;
-    }
+  // LB: setup counters for ChamberStatus/CFGtag logic
+  int ChamberStatusDPsCounter = 0;
+  int CFGtagDPsCounter = 0;
 
-    for (auto& it : mPids) {
-      const auto& el = mapin.find(it.first);
-      if (el == mapin.end()) {
-        LOG(info) << "DP " << it.first << " not found in map";
-      } else {
-        LOG(info) << "DP " << it.first << " found in map";
-      }
-    }
-  }
+  std::unordered_map<DPID, DPVAL> mapin;
+  for (auto& it : dps) {
+    mapin[it.id] = it.data;
 
-  // LB: check if all ChamberStatus/CFGtag DPs were sent by using a vector and then
-  // checking for duplicates, if new size is equal to 540 => all DPs were sent
-  std::vector<DPID> allChamberStatusDPsid;
-  std::vector<DPID> allCFGtagDPsid;
-  for (const auto& it : dps) {
-    auto& itid = it.id;
-    if (std::strstr(itid.get_alias(), "trd_fedChamberStatus") != nullptr) {
-      allChamberStatusDPsid.push_back(it.id);
-    } else if (std::strstr(itid.get_alias(), "trd_fedCFGtag") != nullptr) {
-      allCFGtagDPsid.push_back(it.id);
+    // LB: check if all ChamberStatus/CFGtag DPs were sent in dps
+    // if counter is equal to 540 => all DPs were sent
+    if (std::strstr(it.id.get_alias(), "trd_fedChamberStatus") != nullptr) {
+      ChamberStatusDPsCounter++;
+    } else if (std::strstr(it.id.get_alias(), "trd_fedCFGtag") != nullptr) {
+      CFGtagDPsCounter++;
     }
   }
 
-  // LB: If at least minimum number of DPs are sent, set ChamberStatus/CFGtag update variables to true
-  auto ChamberStatusUniqueIterator = std::unique(allChamberStatusDPsid.begin(), allChamberStatusDPsid.end());
-  auto CFGtagUniqueIterator = std::unique(allCFGtagDPsid.begin(), allCFGtagDPsid.end());
-  int ChamberStatusUniqueDPsCounter = std::distance(allChamberStatusDPsid.begin(), ChamberStatusUniqueIterator);
-  int CFGtagUniqueDPsCounter = std::distance(allCFGtagDPsid.begin(), CFGtagUniqueIterator);
-  if (ChamberStatusUniqueDPsCounter >= mFedMinimunDPsForUpdate) {
+  if (ChamberStatusDPsCounter >= mFedMinimunDPsForUpdate) {
     mFedChamberStatusCompleteDPs = true;
     if (mVerbosity > 1) {
       LOG(info) << "Minimum number of required DPs (" << mFedMinimunDPsForUpdate << ") for ChamberStatus update were found.";
     }
   }
-
-  if (CFGtagUniqueDPsCounter >= mFedMinimunDPsForUpdate) {
+  if (CFGtagDPsCounter >= mFedMinimunDPsForUpdate) {
     mFedCFGtagCompleteDPs = true;
     if (mVerbosity > 1) {
       LOG(info) << "Minimum number of required DPs (" << mFedMinimunDPsForUpdate << ") for CFGtag update were found.";
     }
   }
+  if (mVerbosity > 1) {
+    LOG(info) << "Number of ChamberStatus DPs = " << ChamberStatusDPsCounter;
+    LOG(info) << "Number of CFGtag DPs = " << CFGtagDPsCounter;
+  }
 
   if (mVerbosity > 1) {
-    LOG(info) << "Number of ChamberStatus DPs = " << ChamberStatusUniqueDPsCounter;
-    LOG(info) << "Number of CFGtag DPs = " << CFGtagUniqueDPsCounter;
+    for (auto& it : mPids) {
+      const auto& el = mapin.find(it.first);
+      if (el == mapin.end()) {
+        LOG(info) << "DP " << it.first << " not found in map";
+      } else {
+        LOG(info) << "DP " << it.first << " found in map";
+      }
+    }
   }
 
   // now we process all DPs, one by one
@@ -246,8 +238,8 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
             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;
+            mFirstRunEntryForFedChamberStatusUpdate = true;
+            mFirstRunEntryForFedCFGtagUpdate = true;
             mRunEndTS = mCurrentTS;
           }
 
@@ -271,7 +263,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] && !(mFedChamberStatusCompleteDPs && mNewRunForFedChamberStatusUpdate)) {
+            if (mPids[dpid] && !(mFedChamberStatusCompleteDPs && mFirstRunEntryForFedChamberStatusUpdate)) {
               // 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;
@@ -299,7 +291,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] && !(mFedCFGtagCompleteDPs && mNewRunForFedCFGtagUpdate)) {
+            if (mPids[dpid] && !(mFedCFGtagCompleteDPs && mFirstRunEntryForFedCFGtagUpdate)) {
               // 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;
@@ -739,7 +731,7 @@ void DCSProcessor::clearFedChamberStatusDPsInfo()
   mTRDDCSFedChamberStatus.clear();
   mFedChamberStatusStartTSSet = false;
   mFedChamberStatusCompleteDPs = false;
-  mNewRunForFedChamberStatusUpdate = false;
+  mFirstRunEntryForFedChamberStatusUpdate = false;
   mFedChamberStatusAlarmCounter = 0;
   // reset the 'processed' flags for the fed DPs
   for (auto& it : mPids) {
@@ -756,8 +748,8 @@ void DCSProcessor::clearFedCFGtagDPsInfo()
 {
   mTRDDCSFedCFGtag.clear();
   mFedCFGtagStartTSSet = false;
-  mFedChamberStatusCompleteDPs = false;
-  mNewRunForFedChamberStatusUpdate = false;
+  mFedCFGtagCompleteDPs = false;
+  mFirstRunEntryForFedCFGtagUpdate = false;
   mFedCFGtagAlarmCounter = 0;
   // reset the 'processed' flags for the fed DPs
   for (auto& it : mPids) {