release for sbncode v10_01_04

Merge branch 'release/v10_00_01'

Author: Ibrahim Safa

CMakeLists.txt

@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnobj VERSION 10.00.00 LANGUAGES CXX)
+project(sbnobj VERSION 10.00.01 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

sbnobj/Common/CRT/CMakeLists.txt

@@ -1,6 +1,7 @@
 cet_make_library(
   SOURCE
     CRTHit.cc
+    CRTPMTMatching.cxx
     CRTTrack.cc
     CRTTzero.cc
   LIBRARIES

sbnobj/Common/CRT/CRTPMTMatching.cxx

@@ -0,0 +1,49 @@
+/**
+ * @file   sbnobj/Common/CRTPMTMatching.cxx
+ * @brief  Data product to store CRT PMT Matches (implementation file).
+ * @author Anna Heggestuen (aheggest@colostate.edu) and Francesco Poppi (poppi@bo.infn.it)
+ * @date   November 22, 2024
+ * @see    sbnobj/Common/CRTPMTMatching.hh
+ */
+
+// Library header
+#include "sbnobj/Common/CRT/CRTPMTMatching.hh"
+
+sbn::crt::MatchType sbn::crt::assignFlashClassification(
+  unsigned int topen, unsigned int topex, 
+  unsigned int sideen, unsigned int sideex, 
+  unsigned int bottomen, unsigned int bottomex
+)
+{
+  MatchType flashType;
+  if (topen == 0 && sideen == 0 && topex == 0 && sideex == 0){
+    if(bottomex==0 && bottomen==0) flashType = MatchType::noMatch;
+    else if (bottomex>=1 && bottomen==0) flashType = MatchType::exBottom;
+    else if (bottomex==0 && bottomen>=1) flashType = MatchType::enBottom;
+    else flashType = MatchType::others;
+  }
+  else if (topen == 1 && sideen == 0 && topex == 0 && sideex == 0){
+    if(bottomex==1 && bottomen==0) flashType = MatchType::enTop_exBottom;
+    else flashType = MatchType::enTop;
+  }
+  else if (topen == 0 && sideen == 1 && topex == 0 && sideex == 0)
+    if(bottomex==1 && bottomen==0) flashType = MatchType::enSide_exBottom;
+    else flashType = MatchType::enSide;
+  else if (topen == 1 && sideen == 0 && topex == 0 && sideex == 1)
+    flashType = MatchType::enTop_exSide;
+  else if (topen == 0 && sideen == 0 && topex == 1 && sideex == 0){
+    if(bottomex==0 && bottomen==1) flashType = MatchType::exTop_enBottom;
+    else flashType = MatchType::exTop;
+  }
+  else if (topen == 0 && sideen == 0 && topex == 0 && sideex == 1)
+    if(bottomex==0 && bottomen==1) flashType = MatchType::exSide_enBottom;
+    else flashType = MatchType::exSide;
+  else if (topen >= 1 && sideen == 0 && topex == 0 && sideex == 0) // could also add `if (MatchBottomCRT)` here
+    flashType = MatchType::enTop_mult; 
+  else if (topen >= 1 && sideen == 0 && topex == 0 && sideex >= 1) // and here 
+    flashType = MatchType::enTop_exSide_mult;
+  else
+    flashType = MatchType::others;
+  return flashType;
+
+}

sbnobj/Common/CRT/CRTPMTMatching.hh

@@ -5,8 +5,8 @@
  * @date   June 1 2023.
  */
 
-#ifndef CRTPMTMATCHING_hh_
-#define CRTPMTMATCHING_hh_
+#ifndef SBNOBJ_COMMON_CRTPMTMATCHING_HH
+#define SBNOBJ_COMMON_CRTPMTMATCHING_HH
 
 // C++ includes
 #include <vector>
@@ -33,6 +33,22 @@ namespace sbn::crt {
       exSide_enBottom   = 14, ///< Matched with one Bottom CRT hit before the optical flash and matched with one Side CRT hit after the optical flash.
       others            = 9  ///< All the other cases.
       };
+
+  /**
+   * @brief Returns the classification of a TPC object based on the CRT hits associated to it.
+   * @param topen number of hits on the top CRT earlier than the object (entering)
+   * @param topex number of hits on the top CRT later than the object (exiting)
+   * @param sideen number of hits on any side CRT earlier than the object (entering)
+   * @param sideex number of hits on any side CRT later than the object (exiting)
+   * @param bottomen number of hits on the bottom CRT earlier than the object (entering)
+   * @param bottomex number of hits on the bottom side CRT later than the object (exiting)
+   * @return a value encoding the classification of the TPC object
+   *   
+   */
+  MatchType assignFlashClassification(unsigned int topen, unsigned int topex, 
+				      unsigned int sideen, unsigned int sideex, 
+				      unsigned int bottomen, unsigned int bottomex);
+
   /// Information about a CRT hit matched with a PMT flash.
   struct MatchedCRT {
 

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"/>