Merge branch 'release/v09_88_00_02'

abhatfnal · Apr 4, 2024 · cc0e4d2 · cc0e4d2
2 parents 1846a00 + 1eb84db
commit cc0e4d2
Show file tree

Hide file tree

Showing 101 changed files with 15,373 additions and 11,909 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.84.00.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.88.00.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.84.00.01)
+# project(sbndcode VERSION 09.88.00.02)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

diff --git a/sbndcode/CMakeLists.txt b/sbndcode/CMakeLists.txt
@@ -2,9 +2,10 @@
 add_subdirectory(JobConfigurations)
 add_subdirectory(LArSoftConfigurations)
 add_subdirectory(Utilities)
+add_subdirectory(Calibration)
 add_subdirectory(Geometry)
 add_subdirectory(LArG4)
-add_subdirectory(Calibration)
+add_subdirectory(TPC1DSignalProcessing)
 add_subdirectory(CRT)
 add_subdirectory(DetectorSim)
 add_subdirectory(MCTruthExtractor)
@@ -15,6 +16,7 @@ add_subdirectory(OpDetSim)
 add_subdirectory(OpDetReco)
 add_subdirectory(OpDetAnalyzer)
 add_subdirectory(OpT0Finder)
+#add_subdirectory(PDS)
 #add_subdirectory(CosmicId)
 add_subdirectory(ShowerAna)
 add_subdirectory(Commissioning)

diff --git a/sbndcode/CRT/CRTAna/CRTAnalysis_module.cc b/sbndcode/CRT/CRTAna/CRTAnalysis_module.cc
@@ -96,6 +96,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   int _subrun;
   int _event;
 
+  //mc truth
   std::vector<int16_t>              _mc_trackid;
   std::vector<int16_t>              _mc_pdg;
   std::vector<int16_t>              _mc_status;
@@ -118,6 +119,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<double>               _mc_endpz;
   std::vector<double>               _mc_ende;
 
+  //G4 detector id
   std::vector<int16_t> _ide_trackid;
   std::vector<float>   _ide_e;
   std::vector<float>   _ide_entryx;
@@ -129,6 +131,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<float>   _ide_exitz;
   std::vector<float>   _ide_exitt;
 
+  //front end mother board
   std::vector<uint16_t>              _feb_mac5;
   std::vector<uint16_t>              _feb_flags;
   std::vector<uint32_t>              _feb_ts0;
@@ -137,6 +140,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<std::vector<uint16_t>> _feb_adc;
   std::vector<uint32_t>              _feb_coinc;
 
+  //strip hit to select the strip which has ADC above threshold
   std::vector<uint32_t> _sh_channel;
   std::vector<uint32_t> _sh_ts0;
   std::vector<uint32_t> _sh_ts1;
@@ -154,6 +158,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<double>   _sh_truth_energy;
   std::vector<double>   _sh_truth_time;
 
+  //cluster from x-y coincidence for CRTSpacePoint , this is what we normally call a CRT hit
   std::vector<uint32_t> _cl_ts0;
   std::vector<uint32_t> _cl_ts1;
   std::vector<uint32_t> _cl_unixs;
@@ -188,6 +193,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<double>   _cl_sp_etime;
   std::vector<bool>     _cl_sp_complete;
 
+  //backtrack truth information from reco level
   std::vector<int>     _td_tag_trackid;
   std::vector<int>     _td_tag_pdg;
   std::vector<int16_t> _td_tag_tagger;
@@ -206,6 +212,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::vector<bool>    _td_reco_status;
   std::vector<bool>    _td_reco_triple;
 
+  //track level information
   std::vector<double>              _tr_start_x;
   std::vector<double>              _tr_start_y;
   std::vector<double>              _tr_start_z;