ITS efficiency maps protection for digitization out of range (#12889)

nicolovalle · web-flow · commit fa06b8d46ef2 · 2024-04-01T21:50:52.000+02:00
* ITS efficiency maps pretection for digitization out of range

* ITS efficiency maps pretection for digitization out of range

* ITS efficiency maps pretection for digitization out of range

* typo in info message

* sending message at EOR to infologger

* fix formatting

* fix

* fix

---------

Co-authored-by: Nicolo Valle &lt;nicolo.valle@cern.ch&gt;
diff --git a/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TimeDeadMap.h b/DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TimeDeadMap.h
@@ -73,8 +73,8 @@ class TimeDeadMap
     }
   }
 
-  void decodeMap(unsigned long orbit, o2::itsmft::NoiseMap& noisemap, bool includeStaticMap = true)
-  { // for time-dependent and (optionally) static part
+  void decodeMap(unsigned long orbit, o2::itsmft::NoiseMap& noisemap, bool includeStaticMap = true, long orbitGapAllowed = 330000)
+  { // for time-dependent and (optionally) static part. Use orbitGapAllowed = -1 to ignore check on orbit difference
 
     if (mMAP_VERSION != "3" && mMAP_VERSION != "4") {
       LOG(error) << "Trying to decode time-dependent deadmap version " << mMAP_VERSION << ". Not implemented, doing nothing.";
@@ -84,14 +84,16 @@ class TimeDeadMap
     if (mEvolvingDeadMap.empty()) {
       LOG(warning) << "Time-dependent dead map is empty. Doing nothing.";
       return;
-    } else if (orbit > mEvolvingDeadMap.rbegin()->first + 11000 * 300 || orbit < mEvolvingDeadMap.begin()->first - 11000 * 300) {
-      // the map should not leave several minutes uncovered.
-      LOG(warning) << "Time-dependent dead map: the requested orbit " << orbit << " seems to be out of the range stored in the map.";
     }
 
     std::vector<uint16_t> closestVec;
     long dT = getMapAtOrbit(orbit, closestVec);
 
+    if (orbitGapAllowed >= 0 && std::abs(dT) > orbitGapAllowed) {
+      LOG(warning) << "Requested orbit " << orbit << ", found " << orbit - dT << ". Orbit gap is too high, skipping time-dependent map.";
+      closestVec.clear();
+    }
+
     // add static part if requested. something may be masked twice
     if (includeStaticMap && mMAP_VERSION != "3") {
       closestVec.insert(closestVec.end(), mStaticDeadMap.begin(), mStaticDeadMap.end());
@@ -125,18 +127,19 @@ class TimeDeadMap
   void getStaticMap(std::vector<uint16_t>& mmap) { mmap = mStaticDeadMap; };
 
   long getMapAtOrbit(unsigned long orbit, std::vector<uint16_t>& mmap)
-  { // fills mmap and returns orbit - lower_bound
+  { // fills mmap and returns requested_orbit - found_orbit. Found orbit is the highest key lower or equal to the requested one
     if (mEvolvingDeadMap.empty()) {
       LOG(warning) << "Requested orbit " << orbit << "from an empty time-dependent map. Doing nothing";
       return (long)orbit;
     }
     auto closest = mEvolvingDeadMap.lower_bound(orbit);
-    if (closest != mEvolvingDeadMap.end()) {
+    if (closest != mEvolvingDeadMap.begin()) {
+      --closest;
       mmap = closest->second;
       return (long)orbit - closest->first;
     } else {
-      mmap = mEvolvingDeadMap.rbegin()->second;
-      return (long)(orbit)-mEvolvingDeadMap.rbegin()->first;
+      mmap = mEvolvingDeadMap.begin()->second;
+      return (long)(orbit)-mEvolvingDeadMap.begin()->first;
     }
   }
 
diff --git a/Detectors/ITSMFT/common/workflow/src/DeadMapBuilderSpec.cxx b/Detectors/ITSMFT/common/workflow/src/DeadMapBuilderSpec.cxx
@@ -269,9 +269,9 @@ void ITSMFTDeadMapBuilder::PrepareOutputCcdb(EndOfStreamContext* ec, std::string
 
   if (ec != nullptr) {
 
-    LOG(info) << "Sending object " << info.getPath() << "/" << info.getFileName()
-              << "to ccdb-populator, of size " << image->size() << " bytes, valid for "
-              << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
+    LOG(important) << "Sending object " << info.getPath() << "/" << info.getFileName()
+                   << "to ccdb-populator, of size " << image->size() << " bytes, valid for "
+                   << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
 
     if (mRunMFT) {
       ec->outputs().snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "TimeDeadMap", 1}, *image.get());
@@ -284,9 +284,9 @@ void ITSMFTDeadMapBuilder::PrepareOutputCcdb(EndOfStreamContext* ec, std::string
 
   else if (!ccdburl.empty()) { // send from this workflow
 
-    LOG(info) << mSelfName << "sending object " << ccdburl << "/browse/" << info.getFileName()
-              << " of size " << image->size() << " bytes, valid for "
-              << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
+    LOG(important) << mSelfName << "sending object " << ccdburl << "/browse/" << info.getPath() << "/" << info.getFileName()
+                   << " of size " << image->size() << " bytes, valid for "
+                   << info.getStartValidityTimestamp() << " : " << info.getEndValidityTimestamp();
 
     o2::ccdb::CcdbApi mApi;
     mApi.init(ccdburl);
@@ -335,7 +335,7 @@ void ITSMFTDeadMapBuilder::stop()
       LOG(warning) << "endOfStream not processed. Sending output to ccdb from the " << detname << "deadmap builder workflow.";
       PrepareOutputCcdb(nullptr, mCCDBUrl);
     } else {
-      LOG(warning) << "endOfStream not processed. Nothing forwarded as output.";
+      LOG(alarm) << "endOfStream not processed. Nothing forwarded as output.";
     }
     isEnded = true;
   }
