From db448a197b9d3a3ac7cde62eef40ddc25b5b84ab Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Thu, 23 Oct 2025 15:11:37 -0500
Subject: [PATCH 1/2] Removed accidental (and detrimental) dependency on
 larcorealg::Geometry

---
 sbnobj/Common/CRT/CMakeLists.txt         | 4 ++--
 sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbnobj/Common/CRT/CMakeLists.txt b/sbnobj/Common/CRT/CMakeLists.txt
index 979ce393..23830269 100644
--- a/sbnobj/Common/CRT/CMakeLists.txt
+++ b/sbnobj/Common/CRT/CMakeLists.txt
@@ -8,8 +8,8 @@ cet_make_library(
     CRTHitT0TaggingTruthInfo.cc
     LIBRARIES
     cetlib_except::cetlib_except
-    lardataobj::Simulation
-    larcorealg::Geometry
+    larcoreobj::headers
+    lardataobj::Simulation # for associations to sim::AuxDetIDE
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_CRT)
diff --git a/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh b/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh
index 9247d30c..91753a66 100644
--- a/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh
+++ b/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh
@@ -9,9 +9,9 @@
 
 // C/C++ standard libraries
 #include <limits>
-#include "larcorealg/Geometry/GeometryCore.h"
 #include "larcoreobj/SimpleTypesAndConstants/geo_types.h"
 #include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
+
 // -----------------------------------------------------------------------------
 namespace sbn::crt { 
   /// @brief How was the track fitted when matched with a CRT hit.
@@ -100,4 +100,4 @@ struct sbn::crt::CRTHitT0TaggingInfo {
 // -----------------------------------------------------------------------------
 
 
-#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_
\ No newline at end of file
+#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_

From 6d8e99340df2bbe552e0641738bf7d880b9644da Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Thu, 23 Oct 2025 15:22:04 -0500
Subject: [PATCH 2/2] Restored initialization of sbn::crt::CRTPMTMatching data
 members

---
 sbnobj/Common/CRT/CRTPMTMatching.hh | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sbnobj/Common/CRT/CRTPMTMatching.hh b/sbnobj/Common/CRT/CRTPMTMatching.hh
index 2c2b336a..aa951313 100644
--- a/sbnobj/Common/CRT/CRTPMTMatching.hh
+++ b/sbnobj/Common/CRT/CRTPMTMatching.hh
@@ -59,10 +59,10 @@ namespace sbn::crt {
     static constexpr int NoLocation = -1;
 
     geo::Point_t position;           ///< Hit location [cm]
-    double PMTTimeDiff; //= NoTime;     < CRT hit time minus PMT flash time [us] (instead maybe wanna set NoTime vars in 
-    double time;//        = NoTime;     ///< CRT hit time [us]
-    int sys;     //       = NoLocation; ///< CRT subdetector the hit fell into.
-    int region;//         = NoLocation; ///< Region the matched CRT hit fell into.
+    double PMTTimeDiff = NoTime;     ///< CRT hit time minus PMT flash time [us]
+    double time        = NoTime;     ///< CRT hit time [us]
+    int sys            = NoLocation; ///< CRT subdetector the hit fell into.
+    int region         = NoLocation; ///< Region the matched CRT hit fell into.
   };
 
   struct CRTPMTMatching{
@@ -83,18 +83,18 @@ namespace sbn::crt {
     static constexpr double NoWidth = -1.0;
 
 
-    int          flashID;//             = NoID;    ///< ID of the optical flash.
-    double       flashTime;//           = NoTime;  ///< Time of the optical flash w.r.t. the global trigger [us]
-    double       flashGateTime;//       = NoTime;  ///< Time of the optical flash w.r.t. the beam gate opening [us]
-    double       firstOpHitPeakTime;//  = NoTime;  ///< Time of the first optical hit peak time w.r.t. the global trigger [us]
-    double       firstOpHitStartTime;// = NoTime;  ///< Time of the first optical hit start time w.r.t. the global trigger [us]
-    bool         flashInGate;//         = false;   ///< Flash within gate or not.
-    bool         flashInBeam ;//        = false;   ///< Flash within the beam window of the gate or not.
-    double       flashPE;//             = -1.0;    ///< Total reconstructed light in the flash [photoelectrons]
+    int          flashID             = NoID;    ///< ID of the optical flash.
+    double       flashTime           = NoTime;  ///< Time of the optical flash w.r.t. the global trigger [us]
+    double       flashGateTime       = NoTime;  ///< Time of the optical flash w.r.t. the beam gate opening [us]
+    double       firstOpHitPeakTime  = NoTime;  ///< Time of the first optical hit peak time w.r.t. the global trigger [us]
+    double       firstOpHitStartTime = NoTime;  ///< Time of the first optical hit start time w.r.t. the global trigger [us]
+    bool         flashInGate         = false;   ///< Flash within gate or not.
+    bool         flashInBeam         = false;   ///< Flash within the beam window of the gate or not.
+    double       flashPE             = -1.0;    ///< Total reconstructed light in the flash [photoelectrons]
     geo::Point_t flashPosition;                 ///< Flash barycenter coordinates evaluated using ADCs as weights.
-    double       flashYWidth;//         = NoWidth; ///< Flash spread along Y.
-    double       flashZWidth;//         = NoWidth; ///< Flash spread along Z. 
-    MatchType    flashClassification;// = MatchType::noMatch; ///< Classification of the optical flash.
+    double       flashYWidth         = NoWidth; ///< Flash spread along Y.
+    double       flashZWidth         = NoWidth; ///< Flash spread along Z. 
+    MatchType    flashClassification = MatchType::noMatch; ///< Classification of the optical flash.
     std::vector<MatchedCRT> matchedCRTHits;     ///< Matched CRT Hits with the optical flash.
     unsigned int nTopCRTHitsBefore   = NoCount; ///< Number of Top CRT Hits before the optical flash.
     unsigned int nTopCRTHitsAfter    = NoCount; ///< Number of Top CRT Hits after the optical flash.