Merge branch 'release/v10_03_01'

sbncode release for larsoft v10_03_01

Author: Ibrahim Safa

CMakeLists.txt

@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.01.04 LANGUAGES CXX)
+project(sbncode VERSION 10.03.01 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/Cluster3D/SnippetHit3DBuilderSBN_tool.cc

@@ -25,6 +25,7 @@
 // LArSoft includes
 #include "larcore/Geometry/Geometry.h"
 #include "larcore/Geometry/WireReadout.h"
+#include "larcorealg/Geometry/WireReadoutGeom.h"
 #include "lardata/ArtDataHelper/HitCreator.h"
 #include "lardata/DetectorInfoServices/DetectorClocksService.h"
 #include "lardata/DetectorInfoServices/DetectorPropertiesService.h"
@@ -369,6 +370,7 @@ void SnippetHit3DBuilderSBN::configure(fhicl::ParameterSet const &pset)
     m_outputHistograms     = pset.get<bool                      >("OutputHistograms",      false);
     m_makeAssociations     = pset.get<bool                      >("MakeAssociations",      false);
 
+    m_geometry    = art::ServiceHandle<geo::Geometry const>{}.get();
     m_wireReadout = &art::ServiceHandle<geo::WireReadout const>{}->Get();
 
     // Returns the wire pitch per plane assuming they will be the same for all TPCs
@@ -1822,27 +1824,28 @@ void SnippetHit3DBuilderSBN::CollectArtHits(const art::Event& evt) const
     std::map<geo::PlaneID,double> planeIDToPositionMap;
 
     // Initialize the plane to hit vector map
-    for(auto const& tpcID : m_geometry->Iterate<geo::TPCID>())
+    for(auto const& tpcGeo : m_geometry->Iterate<geo::TPCGeo>())
     {
-      m_planeToSnippetHitMap[geo::PlaneID(tpcID,0)] = SnippetHitMap();
-      m_planeToSnippetHitMap[geo::PlaneID(tpcID,1)] = SnippetHitMap();
-      m_planeToSnippetHitMap[geo::PlaneID(tpcID,2)] = SnippetHitMap();
+        m_planeToSnippetHitMap[geo::PlaneID(tpcGeo.ID(),0)] = SnippetHitMap();
+        m_planeToSnippetHitMap[geo::PlaneID(tpcGeo.ID(),1)] = SnippetHitMap();
+        m_planeToSnippetHitMap[geo::PlaneID(tpcGeo.ID(),2)] = SnippetHitMap();
 
-            // Should we provide output?
-            if (!m_weHaveAllBeenHereBefore)
-            {
-                std::ostringstream outputString;
+        // Should we provide output?
+        if (!m_weHaveAllBeenHereBefore)
+        {
+            std::ostringstream outputString;
 
-        outputString << "***> plane 0 offset: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcID,0))->second
-                     << ", plane 1: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcID,1))->second
-                     << ", plane    2: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcID,2))->second << "\n";
-        outputString << "     Det prop plane 0: " << det_prop.GetXTicksOffset(geo::PlaneID(tpcID,0)) << ", plane 1: "  << det_prop.GetXTicksOffset(geo::PlaneID(tpcID,1)) << ", plane 2: " << det_prop.GetXTicksOffset(geo::PlaneID(tpcID,2)) << ", Trig: " << trigger_offset(clock_data) << "\n";
-                debugMessage += outputString.str() + "\n";
-            }
+            outputString << "***> plane 0 offset: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcGeo.ID(),0))->second
+                         << ", plane 1: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcGeo.ID(),1))->second
+                         << ", plane    2: " << m_PlaneToT0OffsetMap.find(geo::PlaneID(tpcGeo.ID(),2))->second << "\n";
+            outputString << "     Det prop plane 0: " << det_prop.GetXTicksOffset(geo::PlaneID(tpcGeo.ID(),0)) << ", plane 1: "  << det_prop.GetXTicksOffset(geo::PlaneID(tpcGeo.ID(),1)) << ", plane 2: " << det_prop.GetXTicksOffset(geo::PlaneID(tpcGeo.ID(),2)) << ", Trig: " << trigger_offset(clock_data) << "\n";
+                    
+            debugMessage += outputString.str() + "\n";
+        }
 
-      geo::PlaneID const planeID2{tpcID, 2};
-      double xPosition(det_prop.ConvertTicksToX(0., planeID2));
-      planeIDToPositionMap[planeID2] = xPosition;
+        geo::PlaneID const planeID2{tpcGeo.ID(), 2};
+        double xPosition(det_prop.ConvertTicksToX(0., planeID2));
+        planeIDToPositionMap[planeID2] = xPosition;
     }
 
     if (!m_weHaveAllBeenHereBefore)

ups/product_deps

@@ -254,11 +254,11 @@ libdir	fq_dir		lib
 product			version		qual	flags		<table_format=2>
 genie_xsec		v3_04_00	-
 larcv2			v2_2_6		-
-larsoft			v10_01_04	-
+larsoft			v10_03_01	-
 sbnanaobj		v09_23_02_01	-
 sbndaq_artdaq_core	v1_10_04	-
 sbndata			v01_07		-
-sbnobj			v10_00_01	-
+sbnobj			v10_00_02	-
 systematicstools	v01_04_04	-
 nusystematics		v1_05_04	-
 cetmodules		v3_24_01	-	only_for_build