Merge branch 'develop' into feature/aantonak_corsika_showerarea

Author: nathanielerowe

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.09.00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.10.03.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

sbndcode/CMakeLists.txt

@@ -16,6 +16,7 @@ add_subdirectory(OpDetSim)
 add_subdirectory(OpDetReco)
 add_subdirectory(OpDetAnalyzer)
 add_subdirectory(OpT0Finder)
+add_subdirectory(OpPathTool)
 #add_subdirectory(PDS)
 #add_subdirectory(CosmicId)
 add_subdirectory(ShowerAna)
@@ -49,3 +50,4 @@ add_subdirectory(SBNDCVN)
 add_subdirectory(TPCPMTBarycenterMatching)
 
 add_subdirectory(BlipRecoSBND)
+add_subdirectory(LightPropagationCorrection)

sbndcode/CRT/CRTAna/CMakeLists.txt

@@ -1,10 +1,11 @@
 art_make(
          MODULE_LIBRARIES
          ROOT::Tree
+         art_root_io::TFileService_service
          larsim::Utils
+         lardata::DetectorClocksService
          sbnobj::SBND_CRT
          sbnobj::SBND_Timing
-         sbndcode_GeoWrappers
          sbndcode_CRT_CRTBackTracker
 )
 

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -35,7 +35,7 @@
 #include "sbnobj/SBND/CRT/CRTTrack.hh"
 #include "sbnobj/SBND/Timing/DAQTimestamp.hh"
 
-#include "sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h"
+#include "sbndcode/Geometry/GeometryWrappers/CRTGeoService.h"
 #include "sbndcode/Geometry/GeometryWrappers/TPCGeoAlg.h"
 #include "sbndcode/ChannelMaps/CRT/CRTChannelMapService.h"
 #include "sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h"
@@ -95,7 +95,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
 
 private:
 
-  CRTGeoAlg fCRTGeoAlg;
+  art::ServiceHandle<CRTGeoService> fCRTGeoService;
   TPCGeoAlg fTPCGeoAlg;
   CRTBackTrackerAlg fCRTBackTrackerAlg;
 
@@ -351,7 +351,6 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
 
 sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
   : EDAnalyzer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
   , fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg", fhicl::ParameterSet()))
 {
   fMCParticleModuleLabel            = p.get<std::string>("MCParticleModuleLabel", "largeant");
@@ -644,7 +643,7 @@ sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
 
   if(fDebug)
     {
-      for(auto const &[name, tagger] : fCRTGeoAlg.GetTaggers())
+      for(auto const &[name, tagger] : fCRTGeoService->GetTaggers())
         {
           std::cout << "Tagger:  " << tagger.name << '\n'
                     << "X - Min: " << tagger.minX << " Max: " << tagger.maxX << '\n'
@@ -654,7 +653,7 @@ sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
 
       std::cout << std::endl;
 
-      for(auto const &[name, module] : fCRTGeoAlg.GetModules())
+      for(auto const &[name, module] : fCRTGeoService->GetModules())
         {
           std::cout << "Module:  " << module.name << " (" << module.taggerName << ")" << '\n';
           if(module.minos)
@@ -667,7 +666,7 @@ sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
 
       std::cout << std::endl;
 
-      for(auto const &[name, sipm] : fCRTGeoAlg.GetSiPMs())
+      for(auto const &[name, sipm] : fCRTGeoService->GetSiPMs())
         {
           std::cout << "SiPM:  " << sipm.channel << " (" << sipm.channel/32 << " - " << sipm.channel%32 << ")" << '\n'
                     << "x: " << sipm.x << " y: " << sipm.y << " z: " << sipm.z << std::endl;
@@ -1127,7 +1126,7 @@ void sbnd::crt::CRTAnalysis::AnalyseFEBDatas(std::vector<art::Ptr<FEBData>> &FEB
       const auto data = FEBDataVec[i];
 
       _feb_mac5[i]   = data->Mac5();
-      _feb_tagger[i] = fCRTGeoAlg.AuxDetIndexToTaggerEnum(data->Mac5());
+      _feb_tagger[i] = fCRTGeoService->AuxDetIndexToTaggerEnum(data->Mac5());
       _feb_flags[i]  = data->Flags();
       _feb_ts0[i]    = data->Ts0();
       _feb_ts1[i]    = data->Ts1();
@@ -1166,7 +1165,7 @@ void sbnd::crt::CRTAnalysis::AnalyseCRTStripHits(const art::Event &e, const std:
       const auto hit = CRTStripHitVec[i];
 
       _sh_channel[i]    = hit->Channel();
-      _sh_tagger[i]     = fCRTGeoAlg.ChannelToTaggerEnum(hit->Channel());
+      _sh_tagger[i]     = fCRTGeoService->ChannelToTaggerEnum(hit->Channel());
       _sh_ts0[i]        = hit->Ts0();
       _sh_ts1[i]        = hit->Ts1();
       _sh_unixs[i]      = hit->UnixS();
@@ -1180,8 +1179,8 @@ void sbnd::crt::CRTAnalysis::AnalyseCRTStripHits(const art::Event &e, const std:
       if(!fDataMode && fTruthMatch)
         {
           const CRTBackTrackerAlg::TruthMatchMetrics truthMatch = fCRTBackTrackerAlg.TruthMatching(e, hit);
-          const std::vector<double> localpos = fCRTGeoAlg.StripWorldToLocalPos(hit->Channel(), truthMatch.deposit.x, truthMatch.deposit.y, truthMatch.deposit.z);
-          const double width = fCRTGeoAlg.GetStrip(hit->Channel()).width;
+          const std::vector<double> localpos = fCRTGeoService->StripWorldToLocalPos(hit->Channel(), truthMatch.deposit.x, truthMatch.deposit.y, truthMatch.deposit.z);
+          const double width = fCRTGeoService->GetStrip(hit->Channel()).width;
 
           _sh_truth_trackid[i]      = truthMatch.trackid;
           _sh_truth_completeness[i] = truthMatch.completeness;
@@ -1293,11 +1292,11 @@ void sbnd::crt::CRTAnalysis::AnalyseCRTClusters(const art::Event &e, const std::
            */
           if(spacepoints.size() == 1)
             {
-              double pe0 = fCRTGeoAlg.GetSiPM( striphit->Channel() ).gain * striphit->ADC1();
-              double pe1 = fCRTGeoAlg.GetSiPM( striphit->Channel() + 1 ).gain * striphit->ADC2();
+              double pe0 = fCRTGeoService->GetSiPM( striphit->Channel() ).gain * striphit->ADC1();
+              double pe1 = fCRTGeoService->GetSiPM( striphit->Channel() + 1 ).gain * striphit->ADC2();
               double pe  = pe0 + pe1;
 
-              double dist = fCRTGeoAlg.DistanceDownStrip( spacepoints[0]->Pos(), striphit->Channel() );
+              double dist = fCRTGeoService->DistanceDownStrip( spacepoints[0]->Pos(), striphit->Channel() );
 
               double corr = std::pow( dist - fPEAttenuation, 2.0 ) / std::pow( fPEAttenuation, 2.0 );
               double tw_pe = pe * corr;

sbndcode/CRT/CRTAna/crtana_sbnd.fcl

@@ -1,12 +1,10 @@
-#include "crtgeoalg_sbnd.fcl"
 #include "crtbacktrackeralg_sbnd.fcl"
 #include "crtsimmodules_sbnd.fcl"
 
 BEGIN_PROLOG
 
 crtana_sbnd:
 {
-  CRTGeoAlg:         @local::crtgeoalg_sbnd
   CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd 
   PEAttenuation:     @local::sbnd_crtsim.DetSimParams.NpeScaleShift
   PropDelay:         @local::sbnd_crtsim.DetSimParams.PropDelay

sbndcode/CRT/CRTAna/run_crtana.fcl

@@ -1,3 +1,4 @@
+#include "crtgeoservice_sbnd.fcl"
 #include "crtana_sbnd.fcl"
 #include "simulationservices_sbnd.fcl"
 
@@ -12,6 +13,7 @@ services:
   DetectorClocksService:     @local::sbnd_detectorclocks
   LArPropertiesService:      @local::sbnd_properties
   DetectorPropertiesService: @local::sbnd_detproperties
+  CRTGeoService:             @local::crtgeoservice_sbnd
 }
 
 source:

sbndcode/CRT/CRTAna/run_crtana_calibntuples.fcl

@@ -0,0 +1,8 @@
+#include "sbnd_trackcalo_skimmer.fcl"
+#include "run_crtana.fcl"
+
+services.SpaceCharge: @local::sbnd_spacecharge
+
+physics.analyzers.caloskim: @local::caloskim_nodigits_goldentracks
+
+physics.ana: [ crtana, caloskim ]

sbndcode/CRT/CRTAna/run_crtana_calibntuples_data.fcl

@@ -0,0 +1,15 @@
+#include "crt_channel_map_service.fcl"
+#include "crt_calib_service.fcl"
+#include "run_crtana_calibntuples.fcl"
+
+services.ParticleInventoryService: @erase
+services.BackTrackerService:       @erase
+
+services.CRTChannelMapService: @local::crt_channel_map_standard
+services.CRTCalibService:      @local::crt_calib_service
+services.CRTGeoService:        @local::crtgeoservice_data_sbnd
+
+physics.analyzers.caloskim.G4producer: ""
+physics.analyzers.caloskim.SimChannelproducer: ""
+
+physics.analyzers.crtana: @local::crtana_data_sbnd

sbndcode/CRT/CRTAna/run_crtana_data.fcl

@@ -7,5 +7,6 @@ services.BackTrackerService:       @erase
 
 services.CRTChannelMapService: @local::crt_channel_map_standard
 services.CRTCalibService:      @local::crt_calib_service
+services.CRTGeoService:        @local::crtgeoservice_data_sbnd
 
 physics.analyzers.crtana: @local::crtana_data_sbnd

sbndcode/CRT/CRTBackTracker/CMakeLists.txt

@@ -2,7 +2,8 @@ art_make_library(
                  SOURCE       CRTBackTrackerAlg.cc
                  LIBRARIES
                         sbnobj::SBND_CRT
-                        sbndcode::GeoWrappers
+                        sbndcode::TPCGeoAlg
+                        sbndcode_Geometry_GeometryWrappers_CRTGeoService_service
                         larsim::MCCheater_ParticleInventoryService_service
 )