Merge branch 'develop' into feature/acastill_deconvolution_database

Author: nathanielerowe

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.04.06.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 10.04.06.01)
+# project(sbndcode VERSION 10.05.00)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/CMakeLists.txt

@@ -45,3 +45,5 @@ add_subdirectory(ChannelMaps)
 
 # for CVN
 add_subdirectory(SBNDCVN)
+
+add_subdirectory(TPCPMTBarycenterMatching)

sbndcode/CRT/CMakeLists.txt

@@ -2,6 +2,7 @@ add_subdirectory(CRTAna)
 add_subdirectory(CRTBackTracker)
 add_subdirectory(CRTEventDisplay)
 add_subdirectory(CRTReco)
+add_subdirectory(CRTVeto)
 add_subdirectory(CRTSimulation)
 add_subdirectory(CRTTPCMatching)
 add_subdirectory(CRTUtils)
@@ -27,7 +28,10 @@ art_make_library(
         cetlib::cetlib
 )
 
-cet_build_plugin( CRTAuxDetInitializer art::tool
+cet_build_plugin( CRTAuxDetInitializerSBND art::tool
+    SOURCE
+    CRTAuxDetInitializerSBND_tool.cc
+    CRTAuxDetInitializerSBND.cxx
     LIBRARIES REG
         larcorealg::Geometry
         sbndcode_CRTData

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -12,6 +12,7 @@ crtana_sbnd:
   PropDelay:         @local::sbnd_crtsim.DetSimParams.PropDelay
   TimeWalkNorm:      @local::sbnd_crtsim.DetSimParams.TDelayNorm
   TimeWalkScale:     @local::sbnd_crtsim.DetSimParams.TDelayScale
+  TruthMatch:        false
   module_type:       "CRTAnalysis"
 }
 

sbndcode/CRT/CRTAna/crtana_sbnd.fcl

@@ -7,9 +7,11 @@ services:
 {
   TFileService: { fileName: "crtana_sbnd.root" }
   @table::sbnd_basic_services
-  ParticleInventoryService: @local::sbnd_particleinventoryservice
-  BackTrackerService:       @local::sbnd_backtrackerservice
-  DetectorClocksService:    @local::sbnd_detectorclocks
+  ParticleInventoryService:  @local::sbnd_particleinventoryservice
+  BackTrackerService:        @local::sbnd_backtrackerservice
+  DetectorClocksService:     @local::sbnd_detectorclocks
+  LArPropertiesService:      @local::sbnd_properties
+  DetectorPropertiesService: @local::sbnd_detproperties
 }
 
 source:

sbndcode/CRT/CRTAna/run_crtana.fcl

@@ -0,0 +1,6 @@
+#include "run_crtana_data.fcl"
+
+physics.analyzers.crtana.NoTPC:                            false
+physics.analyzers.crtana.TPCTrackModuleLabel:              "pandoraTrack"
+physics.analyzers.crtana.CRTSpacePointMatchingModuleLabel: "crtspacepointmatching"
+physics.analyzers.crtana.CRTTrackMatchingModuleLabel:      "crttrackmatching"

sbndcode/CRT/CRTAna/run_crtana_data_tpc_matching.fcl

@@ -0,0 +1,50 @@
+#include "CRTAuxDetInitializerSBND.h"
+
+namespace sbnd::crt {
+
+  CRTAuxDetInitializerSBND::CRTAuxDetInitializerSBND(fhicl::ParameterSet const&) {}
+
+  geo::AuxDetReadoutInitializers
+  CRTAuxDetInitializerSBND::initialize(std::vector<geo::AuxDetGeo> const& adgeo) const {
+    geo::AuxDetReadoutInitializers result;
+    // Map the AuxDetGeo names to their position in the sorted vector
+    //
+    // Each tagger is composed of scintillator modules, composed of 16 strips.
+    // In the geometry, CRTStripArrays are AuxDets and CRTStrips are the
+    // AuxDetSensitives. Each strip has two SiPM channels, one per optical
+    // fiber (not in the geometry).
+    //
+
+    for (size_t a=0; a<adgeo.size(); a++){
+      std::string volName(adgeo[a].TotalVolume()->GetName());
+
+      long unsigned int number_scintillating_strips = 0;
+
+      if (strncmp(((adgeo[a].TotalVolume())->GetShape())->GetName(), "CRTstripMINOSArray", 18) == 0) {
+        number_scintillating_strips = 20;    //To account for the MINOS modules.
+      }
+      else {number_scintillating_strips = 16;}
+
+      size_t nsv = adgeo[a].NSensitiveVolume();
+      if (nsv != number_scintillating_strips) {
+        throw cet::exception("CRTChannelMap")
+          << "Wrong number of sensitive volumes for CRT volume "
+          << volName << " (got " << nsv << ", expected 16)" << std::endl;
+      }
+
+      result.ADGeoToName[a] = volName;
+      result.NameToADGeo[volName] = a;
+
+      if (volName.find("CRTStripArray") != std::string::npos) {
+        for (size_t svID=0; svID<number_scintillating_strips; svID++) {
+          for (size_t ich=0; ich<2; ich++) {
+            size_t chID = 2 * svID + ich;
+            result.ADGeoToChannelAndSV[a].push_back(std::make_pair(chID, svID));
+          }
+        }
+      }
+    }
+    return result;
+  }
+
+} // namespace sbnd::crt

sbndcode/CRT/CRTAuxDetInitializerSBND.cxx

@@ -0,0 +1,21 @@
+#ifndef SBND_CRT_CRTAUXDETINITIALIZERSBND_H
+#define SBND_CRT_CRTAUXDETINITIALIZERSBND_H
+
+#include "larcorealg/Geometry/AuxDetGeo.h"
+#include "larcorealg/Geometry/AuxDetSensitiveGeo.h"
+#include "larcorealg/Geometry/AuxDetGeometryCore.h"
+
+namespace sbnd::crt {
+
+  class CRTAuxDetInitializerSBND : public geo::AuxDetInitializer {
+  public:
+    explicit CRTAuxDetInitializerSBND(fhicl::ParameterSet const&);
+
+  private:
+    geo::AuxDetReadoutInitializers
+    initialize(std::vector<geo::AuxDetGeo> const& adgeo) const override;
+  };
+
+} // namespace sbnd::crt
+
+#endif // SBND_CRT_CRTAUXDETINITIALIZERSBND_H

sbndcode/CRT/CRTAuxDetInitializerSBND.h

@@ -0,0 +1,4 @@
+#include "sbndcode/CRT/CRTAuxDetInitializerSBND.h"
+#include "art/Utilities/ToolMacros.h"
+
+DEFINE_ART_CLASS_TOOL(sbnd::crt::CRTAuxDetInitializerSBND)