[roc-trig-monitor] Add CAL count

Author: kostorr

src/CommandLineUtilities/ProgramTriggerMonitor.cxx

@@ -72,10 +72,10 @@ class ProgramTriggerMonitor : public Program
       auto cruBar2 = std::dynamic_pointer_cast<CruBar>(bar);
 
       std::ostringstream table;
-      auto formatHeader = "  %-12s %-15s %-12s %-15s %-12s %-15s %-12s %-12s\n";
-      auto formatRow = "  %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-12s\n";
-      auto formatRowUpdateable = "  %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-12s";
-      auto header = (boost::format(formatHeader) % "HB" % "HB rate (kHz)" % "PHY" % "PHY rate (kHz)" % "TOF" % "TOF rate (kHz)" % "SOX" % "EOX").str();
+      auto formatHeader = "  %-12s %-15s %-12s %-15s %-12s %-15s %-12s %-15s %-12s %-12s\n";
+      auto formatRow = "  %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-12s\n";
+      auto formatRowUpdateable = "  %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-15.3f %-12s %-12s";
+      auto header = (boost::format(formatHeader) % "HB" % "HB rate (kHz)" % "PHY" % "PHY rate (kHz)" % "CAL" % "CAL rate (kHz)" % "TOF" % "TOF rate (kHz)" % "SOX" % "EOX").str();
       auto lineFat = std::string(header.length(), '=') + '\n';
       auto lineThin = std::string(header.length(), '-') + '\n';
 
@@ -90,15 +90,15 @@ class ProgramTriggerMonitor : public Program
 
         while (!isSigInt()) {
           Cru::TriggerMonitoringInfo tmi = cruBar2->monitorTriggers(true);
-          auto format = boost::format(formatRowUpdateable) % tmi.hbCount % tmi.hbRate % tmi.phyCount % tmi.phyRate % tmi.tofCount % tmi.tofRate % tmi.soxCount % tmi.eoxCount;
+          auto format = boost::format(formatRowUpdateable) % tmi.hbCount % tmi.hbRate % tmi.phyCount % tmi.phyRate % tmi.calCount % tmi.calRate % tmi.tofCount % tmi.tofRate % tmi.soxCount % tmi.eoxCount;
           std::cout << '\r' << format << std::flush;
         }
 
         std::cout << std::endl
                   << lineFat;
       } else {
         Cru::TriggerMonitoringInfo tmi = cruBar2->monitorTriggers();
-        auto format = boost::format(formatRow) % tmi.hbCount % tmi.hbRate % tmi.phyCount % tmi.phyRate % tmi.tofCount % tmi.tofRate % tmi.soxCount % tmi.eoxCount;
+        auto format = boost::format(formatRow) % tmi.hbCount % tmi.hbRate % tmi.phyCount % tmi.phyRate % tmi.calCount % tmi.calRate % tmi.tofCount % tmi.tofRate % tmi.soxCount % tmi.eoxCount;
         table << format << lineFat;
         std::cout << table.str();
       }

src/Cru/Common.h

@@ -176,6 +176,8 @@ struct TriggerMonitoringInfo {
   double phyRate;
   uint64_t tofCount;
   double tofRate;
+  uint64_t calCount;
+  double calRate;
   uint64_t eoxCount;
   uint64_t soxCount;
 };

src/Cru/Constants.h

@@ -224,6 +224,7 @@ static constexpr Register ONU_MGT_STICKYS(0x00222014);
 static constexpr Register LTU_HBTRIG_CNT(0x00200004);
 static constexpr Register LTU_PHYSTRIG_CNT(0x00200008);
 static constexpr Register LTU_TOFTRIG_CNT(0x00200018);
+static constexpr Register LTU_CALTRIG_CNT(0x00200018);
 static constexpr Register LTU_EOX_SOX_CNT(0x0020000c);
 
 //** GBT **//

src/Cru/CruBar.cxx

@@ -616,11 +616,13 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)
   uint32_t hbCountPrev = ttc.getHbTriggerLtuCount();
   uint32_t phyCountPrev = ttc.getPhyTriggerLtuCount();
   uint32_t tofCountPrev = ttc.getTofTriggerLtuCount();
+  uint32_t calCountPrev = ttc.getCalTriggerLtuCount();
 
   // base values to report relative counts for updateable monitoring (e.g. for a single run)
   static uint32_t hbCountBase = hbCountPrev;
   static uint32_t phyCountBase = phyCountPrev;
   static uint32_t tofCountBase = tofCountPrev;
+  static uint32_t calCountBase = calCountPrev;
   static std::pair<uint32_t, uint32_t> statEoxSox = ttc.getEoxSoxLtuCount();
   static uint32_t eoxCountBase = statEoxSox.first;
   static uint32_t soxCountBase = statEoxSox.second;
@@ -629,6 +631,7 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)
   uint32_t hbCount = ttc.getHbTriggerLtuCount();
   uint32_t phyCount = ttc.getPhyTriggerLtuCount();
   uint32_t tofCount = ttc.getTofTriggerLtuCount();
+  uint32_t calCount = ttc.getCalTriggerLtuCount();
   std::pair<uint32_t, uint32_t> eoxSox = ttc.getEoxSoxLtuCount();
   uint32_t eoxCount = eoxSox.first;
   uint32_t soxCount = eoxSox.second;
@@ -655,11 +658,19 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)
     tofDiff = tofCount - tofCountPrev;
   }
 
+  uint64_t calDiff;
+  if (calCountPrev > calCount) {
+    calDiff = calCount + pow(2, 16) - calCountPrev;
+  } else {
+    calDiff = calCount - calCountPrev;
+  }
+
   // report absolute values + rates(1s)
   if (!updateable) {
     return { hbCount, hbDiff / pow(10, 3),
              phyCount, phyDiff / pow(10, 3),
              tofCount, tofDiff / pow(10, 3),
+             calCount, calDiff / pow(10, 3),
              eoxCount, soxCount };
   }
 
@@ -682,6 +693,7 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)
   return { hbCount - hbCountBase, hbDiff / pow(10, 3),
            phyCount - phyCountBase, phyDiff / pow(10, 3),
            tofCount - tofCountBase, tofDiff / pow(10, 3),
+           calCount - calCountBase, calDiff / pow(10, 3),
            eoxDiff, soxDiff };
 }
 

src/Cru/Ttc.cxx

@@ -298,7 +298,12 @@ std::pair<uint32_t, uint32_t> Ttc::getEoxSoxLtuCount()
 
 uint32_t Ttc::getTofTriggerLtuCount()
 {
-  return mBar->readRegister(Cru::Registers::LTU_TOFTRIG_CNT.index);
+  return mBar->readRegister(Cru::Registers::LTU_TOFTRIG_CNT.index) & 0xffff;
+}
+
+uint32_t Ttc::getCalTriggerLtuCount()
+{
+  return mBar->readRegister(Cru::Registers::LTU_CALTRIG_CNT.index) >> 16;
 }
 
 /*** CTP EMULATOR METHODS ***/

src/Cru/Ttc.h

@@ -46,6 +46,7 @@ class Ttc
   uint32_t getHbTriggerLtuCount();
   uint32_t getPhyTriggerLtuCount();
   uint32_t getTofTriggerLtuCount();
+  uint32_t getCalTriggerLtuCount();
   std::pair<uint32_t, uint32_t> getEoxSoxLtuCount();
 
   void resetCtpEmulator(bool doReset);