Fix MFT DCS DP processor

shahor02 · shahor02 · commit 2f4a93456dc0 · 2022-05-28T02:59:08.000+04:00
diff --git a/Detectors/ITSMFT/MFT/condition/src/MFTDCSProcessor.cxx b/Detectors/ITSMFT/MFT/condition/src/MFTDCSProcessor.cxx
@@ -63,19 +63,20 @@ int MFTDCSProcessor::process(const gsl::span<const DPCOM> dps)
     mStartTFset = true;
   }
 
-  std::unordered_map<DPID, DPVAL> mapin;
-  for (auto& it : dps) {
-    mapin[it.id] = it.data;
-  }
-  for (auto& it : mPids) {
-    const auto& el = mapin.find(it.first);
-    if (el == mapin.end()) {
-      LOG(debug) << "DP " << it.first << " not found in map";
-    } else {
-      LOG(debug) << "DP " << it.first << " found in map";
+  if (false) { // RS: why do we need to lose CPU on this dummy check?
+    std::unordered_map<DPID, DPVAL> mapin;
+    for (auto& it : dps) {
+      mapin[it.id] = it.data;
+    }
+    for (auto& it : mPids) {
+      const auto& el = mapin.find(it.first);
+      if (el == mapin.end()) {
+        LOG(debug) << "DP " << it.first << " not found in map";
+      } else {
+        LOG(debug) << "DP " << it.first << " found in map";
+      }
     }
   }
-
   // now we process all DPs, one by one
   for (const auto& it : dps) {
     // we process only the DPs defined in the configuration
@@ -91,7 +92,6 @@ int MFTDCSProcessor::process(const gsl::span<const DPCOM> dps)
     processDP(new_it);
     */
     processDP(it);
-
     mPids[it.id] = true;
   }
 
@@ -156,11 +156,12 @@ void MFTDCSProcessor::updateDPsCCDB()
     double double_value;
   } converter0, converter1;
 
-  for (const auto& it : mPids) {
+  for (auto& it : mPids) {
     const auto& type = it.first.get_type();
     if (type == o2::dcs::DPVAL_DOUBLE) {
       auto& mftdcs = mMFTDCS[it.first];
-      if (it.second == true) { // we processed the DP at least 1x
+      if (it.second) {     // we processed the DP at least 1x
+        it.second = false; // once the point was used, reset it
         auto& dpvect = mDpsdoublesmap[it.first];
         mftdcs.firstValue.first = dpvect[0].get_epoch_time();
         converter0.raw_data = dpvect[0].payload_pt1;
diff --git a/Detectors/ITSMFT/MFT/condition/testWorkflow/MFTDCSDataProcessorSpec.h b/Detectors/ITSMFT/MFT/condition/testWorkflow/MFTDCSDataProcessorSpec.h
@@ -146,7 +146,6 @@ class MFTDCSDataProcessor : public o2::framework::Task
 
     auto timeNow = HighResClock::now();
     Duration elapsedTime = timeNow - mTimer; // in seconds
-
     if (elapsedTime.count() >= mDPsUpdateInterval) {
       sendDPsoutput(pc.outputs());
       mTimer = timeNow;
@@ -183,8 +182,7 @@ class MFTDCSDataProcessor : public o2::framework::Task
     }
 
     if (tend == -1) {
-      constexpr long SECONDSPERYEAR = 365 * 24 * 60 * 60;
-      tend = o2::ccdb::getFutureTimestamp(SECONDSPERYEAR);
+      tend = tstart + o2::ccdb::CcdbObjectInfo::MONTH;
     }
 
     info.setStartValidityTimestamp(tstart);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ class MFTDCSDataProcessor : public o2::framework::Task`
`146`	`146`
`147`	`147`	`auto timeNow = HighResClock::now();`
`148`	`148`	`Duration elapsedTime = timeNow - mTimer; // in seconds`
`149`		`-`
`150`	`149`	`if (elapsedTime.count() >= mDPsUpdateInterval) {`
`151`	`150`	`sendDPsoutput(pc.outputs());`
`152`	`151`	`mTimer = timeNow;`
`@@ -183,8 +182,7 @@ class MFTDCSDataProcessor : public o2::framework::Task`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`if (tend == -1) {`
`186`		`- constexpr long SECONDSPERYEAR = 365 * 24 * 60 * 60;`
`187`		`- tend = o2::ccdb::getFutureTimestamp(SECONDSPERYEAR);`
	`185`	`+ tend = tstart + o2::ccdb::CcdbObjectInfo::MONTH;`
`188`	`186`	`}`
`189`	`187`
`190`	`188`	`info.setStartValidityTimestamp(tstart);`