Merge pull request #110 from PetrilloAtWork/feature/gp_triggerTicks

sbn::ExtraTriggerInfo: added cryostat trigger information

Author: ibsafa

sbnobj/Common/Trigger/ExtraTriggerInfo.cxx

@@ -205,42 +205,29 @@ std::ostream& sbn::operator<< (std::ostream& out, ExtraTriggerInfo const& info)
   if (info.triggerLocationBits != 0) {
     out << "\nLocation(s) of trigger:";
     for (std::string const& bitName: names(info.triggerLocation()))
-      out << " " << bitName;
-  }
-  out << "\nEast cryostat: "
-      << info.cryostats[ExtraTriggerInfo::EastCryostat].triggerCount
-      << " triggers";
-  if (auto const& cryo = info.cryostats[ExtraTriggerInfo::EastCryostat];
-      cryo.hasAnyActivity()
-  ) {
-    out << "\n  trigger logic: ";
-    if (cryo.triggerLogicBits) {
-      for (std::string const& bitName: names(cryo.triggerLogic()))
-        out << " " << bitName;
-    }
-    else out << " none!";
-    out
-      << "\n  east wall:  "
-      << dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::EastPMTwall])
-      << ", sectors: "
-      << dumpBits(cryo.sectorStatus[ExtraTriggerInfo::EastPMTwall], 6)
-      << "\n  west wall:  "
-      << dumpLVDSmask(cryo.LVDSstatus[ExtraTriggerInfo::WestPMTwall])
-      << ", sectors: "
-      << dumpBits(cryo.sectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
-      ;
+      out << "  * " << bitName;
   }
+  
+  out << "\nWest cryostat: " << info.cryostats[ExtraTriggerInfo::WestCryostat];
+  out << "\nEast cryostat: " << info.cryostats[ExtraTriggerInfo::EastCryostat];
+  
+  return out;
+} // sbn::operator<< (ExtraTriggerInfo)
 
-  out << "\nWest cryostat: "
-      << info.cryostats[ExtraTriggerInfo::WestCryostat].triggerCount
-      << " triggers";
-  if (auto const& cryo = info.cryostats[ExtraTriggerInfo::WestCryostat];
-      cryo.hasAnyActivity()
-  ) {
+
+
+// -----------------------------------------------------------------------------
+std::ostream& sbn::operator<<
+  (std::ostream& out, sbn::ExtraTriggerInfo::CryostatInfo const& cryo)
+{
+  out << cryo.triggerCount << " triggers";
+  if (cryo.hasTrigger())
+    out << ", the first one " << cryo.beamToTrigger << " ns after gate";
+  if (cryo.hasAnyActivity()) {
     out << "\n  trigger logic: ";
     if (cryo.triggerLogicBits) {
       for (std::string const& bitName: names(cryo.triggerLogic()))
-        out << " * " << bitName;
+        out << "  * " << bitName;
     }
     else out << " none!";
     out
@@ -254,9 +241,8 @@ std::ostream& sbn::operator<< (std::ostream& out, ExtraTriggerInfo const& info)
       << dumpBits(cryo.sectorStatus[ExtraTriggerInfo::WestPMTwall], 6)
       ;
   }
-  
   return out;
-} // sbn::operator<< (ExtraTriggerInfo)
+} // std::ostream& sbn::operator<< (ExtraTriggerInfo::CryostatInfo)
 
 
 // -----------------------------------------------------------------------------

sbnobj/Common/Trigger/ExtraTriggerInfo.h

@@ -190,6 +190,11 @@ struct sbn::ExtraTriggerInfo {
 
   /// Trigger data pertaining a single cryostat.
   struct CryostatInfo {
+    
+    /// Special value for no local cryostat trigger.
+    static constexpr unsigned int NoTrigger
+      = std::numeric_limits<unsigned int>::max();
+    
     /// Count of triggers in this cryostat.
     unsigned long int triggerCount { 0 };
 
@@ -244,6 +249,10 @@ struct sbn::ExtraTriggerInfo {
     /// @see sbn::bits::triggerLogicMask
     unsigned int triggerLogicBits { 0U };
 
+    /// Delay from the beam gate opening to the first cryostat trigger
+    /// (`NoTrigger` if no trigger is available in the cryostat) [ns]
+    unsigned int beamToTrigger { NoTrigger };
+    
     /**
      * @brief Returns the type of logic satisfied by the trigger.
      * 
@@ -270,6 +279,9 @@ struct sbn::ExtraTriggerInfo {
     /// Returns whether there is some recorded activity (LVDS or sector).
     constexpr bool hasAnyActivity() const;
 
+    /// Returns whether this cryostat has a trigger in the gate.
+    constexpr bool hasTrigger() const;
+    
   }; // CryostatInfo
 
 
@@ -346,6 +358,8 @@ struct sbn::ExtraTriggerInfo {
 
 namespace sbn {
   std::ostream& operator<< (std::ostream& out, ExtraTriggerInfo const& info);
+  std::ostream& operator<<
+    (std::ostream& out, ExtraTriggerInfo::CryostatInfo const& cryo);
 }
 
 
@@ -375,6 +389,13 @@ inline constexpr bool sbn::ExtraTriggerInfo::CryostatInfo::hasAnyActivity()
 } // sbn::ExtraTriggerInfo::CryostatInfo::hasAnyActivity()
 
 
+// -----------------------------------------------------------------------------
+inline constexpr bool sbn::ExtraTriggerInfo::CryostatInfo::hasTrigger() const
+{
+  return beamToTrigger != NoTrigger;
+} // sbn::ExtraTriggerInfo::CryostatInfo::hasTrigger()
+
+
 // -----------------------------------------------------------------------------
 
 

sbnobj/Common/Trigger/classes_def.xml

@@ -27,7 +27,8 @@
     <enum name="sbn::bits::triggerSource" ClassVersion="10" />
     <enum name="sbn::bits::triggerLocation" ClassVersion="10" />
     <enum name="sbn::bits::triggerType" ClassVersion="10" />
-    <class name="sbn::ExtraTriggerInfo::CryostatInfo" ClassVersion="13" >
+    <class name="sbn::ExtraTriggerInfo::CryostatInfo" ClassVersion="14" >
+     <version ClassVersion="14" checksum="1406793077"/>
      <version ClassVersion="13" checksum="2956313925"/>
      <version ClassVersion="12" checksum="804951501"/>
      <version ClassVersion="11" checksum="3455337645"/>