fix in TOF diagnostic words

Author: noferini

DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h

@@ -41,11 +41,24 @@ class Diagnostic
   int fillEmptyCrate(int crate, int frequency = 1) { return fill(getEmptyCrateKey(crate), frequency); }
   static ULong64_t getEmptyCrateKey(int crate);
   static ULong64_t getNoisyChannelKey(int channel);
+  static ULong64_t getTRMKey(int crate, int trm);
   void print() const;
   void clear() { mVector.clear(); }
   void fill(const Diagnostic& diag);                       // for calibration
   void fill(const gsl::span<const o2::tof::Diagnostic>){}; // for calibration
   void merge(const Diagnostic* prev);
+  unsigned long size() const { return mVector.size(); }
+  ULong64_t getPattern(int i) const
+  {
+    auto iter = mVector.begin();
+    for (; i-- > 0;) {
+      iter++;
+    }
+    return iter->first;
+  }
+  int getSlot(ULong64_t pattern) const;
+  int getCrate(ULong64_t pattern) const;
+  int getChannel(ULong64_t pattern) const;
 
  private:
   std::map<ULong64_t, uint32_t> mVector; // diagnostic frequency vector (key/pattern , frequency)

DataFormats/Detectors/TOF/src/Diagnostic.cxx

@@ -70,16 +70,40 @@ void Diagnostic::print() const
 
 ULong64_t Diagnostic::getEmptyCrateKey(int crate)
 {
-  ULong64_t key = (ULong64_t(11) << 32) + (ULong64_t(crate) << 36); // slot=11 means empty crate
+  ULong64_t key = (ULong64_t(13) << 32) + (ULong64_t(crate) << 36); // slot=13 means empty crate
   return key;
 }
 
 ULong64_t Diagnostic::getNoisyChannelKey(int channel)
 {
-  ULong64_t key = (ULong64_t(12) << 32) + channel; // slot=12 means noisy channels
+  ULong64_t key = (ULong64_t(14) << 32) + channel; // slot=14 means noisy channels
   return key;
 }
 
+ULong64_t Diagnostic::getTRMKey(int crate, int trm)
+{
+  ULong64_t key = (ULong64_t(trm) << 32) + (ULong64_t(crate) << 36);
+  return key;
+}
+
+int Diagnostic::getSlot(ULong64_t pattern) const
+{
+  return (pattern & 68719476735) / 4294967296;
+}
+
+int Diagnostic::getCrate(ULong64_t pattern) const
+{
+  return (pattern & 8796093022207) / 68719476736;
+}
+
+int Diagnostic::getChannel(ULong64_t pattern) const
+{
+  if (getSlot(pattern) == 14 && getCrate(pattern) == 0 && pattern != 0) {
+    return (pattern & 262143);
+  }
+  return -1;
+}
+
 void Diagnostic::fill(const Diagnostic& diag)
 {
   LOG(DEBUG) << "Filling diagnostic word";

Detectors/TOF/base/src/WindowFiller.cxx

@@ -464,7 +464,7 @@ void WindowFiller::fillDiagnosticFrequency()
         for (int dd = fd; dd < lastdia; dd++) {
           if (mPatterns[dd] >= 28) {
             slot = mPatterns[dd] - 28;
-            key = (ULong64_t(slot) << 32) + (ULong64_t(ic) << 36);
+            key = mDiagnosticFrequency.getTRMKey(ic, slot);
             continue;
           }