Merge branch 'develop' into feature/munjung-data_caf

Author: bear-is-asleep

.github/pull_request_template.md

@@ -6,7 +6,7 @@ Please provide a detailed description of the changes this pull request introduce
 - [ ] Assigned at least 1 reviewer under `Reviewers`,
 - [ ] Assigned all contributers including yourself under `Assignees`
 - [ ] Linked any relevant issues under `Developement`
-- [ ] Does this PR affect CAF data format? If so, please assign a CAF maintainer as additional reviewer.
+- [ ] Does this PR affect CAF data format? If so, please assign a CAF maintainer ([PetrilloAtWork](https://github.com/PetrilloAtWork) or [JosiePaton](https://github.com/JosiePaton)) as additional reviewer.
 - [ ] Does this affect the standard workflow? 
 
 ### Relevant PR links (optional)

CMakeLists.txt

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

CONTRIBUTING.md

@@ -1,2 +1,2 @@
 # Contributing
-For most recent contributing guidelines, see [docDB 37211 slides 7-10](https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=37211).
+For most recent contributing guidelines, see [docDB 38041](https://sbn-docdb.fnal.gov/cgi-bin/sso/ShowDocument?docid=38041).

sbndcode/CRT/CRTAna/CMakeLists.txt

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

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -277,8 +277,8 @@ class sbnd::crt::CRTCalibAna : public art::EDAnalyzer {
 
 sbnd::crt::CRTCalibAna::CRTCalibAna(fhicl::ParameterSet const& p)
   : EDAnalyzer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
-  , fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg", fhicl::ParameterSet()))
+  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
+  , fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg"))
   {
     fMCParticleModuleLabel            = p.get<std::string>("MCParticleModuleLabel", "largeant");
     fSimDepositModuleLabel            = p.get<std::string>("SimDepositModuleLabel", "genericcrt");
@@ -967,8 +967,8 @@ void sbnd::crt::CRTCalibAna::AnalyseCRTClusters(const art::Event &e, const std::
           _cl_sp_z[i]        = spacepoint->Z();
           _cl_sp_ez[i]       = spacepoint->ZErr();
           _cl_sp_pe[i]       = spacepoint->PE();
-          _cl_sp_time[i]     = spacepoint->Time();
-          _cl_sp_etime[i]    = spacepoint->TimeErr();
+          _cl_sp_time[i]     = spacepoint->Ts0();
+          _cl_sp_etime[i]    = spacepoint->Ts0Err();
           _cl_sp_complete[i] = spacepoint->Complete();
         }
       else
@@ -1112,8 +1112,8 @@ void sbnd::crt::CRTCalibAna::AnalyseCRTTracks(const art::Event &e, const std::ve
       _tr_dir_y[i] = dir.Y();
       _tr_dir_z[i] = dir.Z();
 
-      _tr_time[i]    = track->Time();
-      _tr_etime[i]   = track->TimeErr();
+      _tr_time[i]    = track->Ts0();
+      _tr_etime[i]   = track->Ts0();
       _tr_pe[i]      = track->PE();
       _tr_length[i]  = track->Length();
       _tr_tof[i]     = track->ToF();
@@ -1267,7 +1267,7 @@ void sbnd::crt::CRTCalibAna::AnalyseTPCMatching(const art::Event &e, const art::
 
           _tpc_sp_matched[nActualTracks]    = true;
           _tpc_sp_good_match[nActualTracks] = truthMatch.trackid == trackid;
-          _tpc_sp_time[nActualTracks]       = spacepoint->Time();
+          _tpc_sp_time[nActualTracks]       = spacepoint->Ts0();
           _tpc_sp_score[nActualTracks]      = spMatch.TriggerConfidence();
         }
       else
@@ -1287,7 +1287,7 @@ void sbnd::crt::CRTCalibAna::AnalyseTPCMatching(const art::Event &e, const art::
 
           _tpc_tr_matched[nActualTracks]    = true;
           _tpc_tr_good_match[nActualTracks] = truthMatch.trackid == trackid;
-          _tpc_tr_time[nActualTracks]       = crttrack->Time();
+          _tpc_tr_time[nActualTracks]       = crttrack->Ts0();
           _tpc_tr_score[nActualTracks]      = trackMatch.TriggerConfidence();
         }
       else

sbndcode/CRT/CRTAna/CRTCalibAna_module.cc

@@ -1,5 +1,6 @@
-#include "simulationservices_sbnd.fcl"
+#include "crtgeoalg_sbnd.fcl"
 #include "crtbacktrackeralg_sbnd.fcl"
+#include "simulationservices_sbnd.fcl"
 
 process_name: CRTAnalyzer
 
@@ -24,6 +25,7 @@ physics:
     crtana: 
     { 
       module_type:       "CRTAnalysis"
+      CRTGeoAlg:         @local::crtgeoalg_sbnd
       CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd
     }
   }

sbndcode/CRT/CRTAna/run_crtana.fcl

@@ -0,0 +1,15 @@
+#include "crt_channel_map_service.fcl"
+#include "crt_calib_service.fcl"
+#include "run_crtana.fcl"
+
+services.ParticleInventoryService: @erase
+services.BackTrackerService:       @erase
+
+services.CRTChannelMapService: @local::crt_channel_map_standard
+services.CRTCalibService:      @local::crt_calib_service
+
+physics.analyzers.crtana.FEBDataModuleLabel: "crtdecoder"
+physics.analyzers.crtana.DataMode:           true
+physics.analyzers.crtana.NoTPC:              true
+physics.analyzers.crtana.HasPTB:             true
+physics.analyzers.crtana.HasTDC:             true

sbndcode/CRT/CRTAna/run_crtana_data.fcl

@@ -8,7 +8,7 @@ namespace sbnd::crt {
   }
 
   CRTBackTrackerAlg::CRTBackTrackerAlg(){}
-  
+
   CRTBackTrackerAlg::~CRTBackTrackerAlg(){}
 
   void CRTBackTrackerAlg::reconfigure(const Config& config)
@@ -20,6 +20,7 @@ namespace sbnd::crt {
     fClusterModuleLabel = config.ClusterModuleLabel();
     fSpacePointModuleLabel = config.SpacePointModuleLabel();
     fTrackModuleLabel = config.TrackModuleLabel();
+    fCRTGeoAlgConfig = config.GeoAlgConfig();
 
     return;
   }
@@ -37,6 +38,8 @@ namespace sbnd::crt {
     fTrackIDMotherMap.clear();
     fStripHitMCPMap.clear();
 
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     art::Handle<std::vector<sim::ParticleAncestryMap>> droppedTrackIDMapVecHandle;
     event.getByLabel(fSimModuleLabel, droppedTrackIDMapVecHandle);
 
@@ -91,7 +94,7 @@ namespace sbnd::crt {
         const double x = (ide->entryX + ide->exitX) / 2.;
         const double y = (ide->entryY + ide->exitY) / 2.;
         const double z = (ide->entryZ + ide->exitZ) / 2.;
-        const CRTTagger tagger = fCRTGeoAlg.WhichTagger(x, y, z);
+        const CRTTagger tagger = geoAlg.WhichTagger(x, y, z);
 
         const int rollUpID = RollUpID(ide->trackID);
 
@@ -244,7 +247,7 @@ namespace sbnd::crt {
         const double x = (ide->entryX + ide->exitX) / 2.;
         const double y = (ide->entryY + ide->exitY) / 2.;
         const double z = (ide->entryZ + ide->exitZ) / 2.;
-        const CRTTagger tagger = fCRTGeoAlg.WhichTagger(x, y, z);
+        const CRTTagger tagger = geoAlg.WhichTagger(x, y, z);
 
         const int rollUpID = RollUpID(ide->trackID);
         Category category(rollUpID, tagger);
@@ -260,7 +263,7 @@ namespace sbnd::crt {
 
     for(auto const stripHit : stripHitVec)
       {
-        const CRTTagger tagger = fCRTGeoAlg.ChannelToTaggerEnum(stripHit->Channel());
+        const CRTTagger tagger = geoAlg.ChannelToTaggerEnum(stripHit->Channel());
         TruthMatchMetrics truthMatch = TruthMatching(event, stripHit);
 
         fStripHitMCPMap[stripHit.key()] = truthMatch.trackid;
@@ -337,6 +340,8 @@ namespace sbnd::crt {
 
   CRTBackTrackerAlg::TruthMatchMetrics CRTBackTrackerAlg::TruthMatching(const art::Event &event, const art::Ptr<CRTStripHit> &stripHit)
   {  
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     art::Handle<std::vector<FEBData>> febDataHandle;
     event.getByLabel(fFEBDataModuleLabel, febDataHandle);
 
@@ -345,7 +350,7 @@ namespace sbnd::crt {
 
     art::FindManyP<sim::AuxDetIDE, FEBTruthInfo> febDataToIDEs(febDataHandle, event, fFEBDataModuleLabel);
     art::FindOneP<FEBData> stripHitToFEBData(stripHitHandle, event, fStripHitModuleLabel);
-    const CRTTagger tagger = fCRTGeoAlg.ChannelToTaggerEnum(stripHit->Channel());
+    const CRTTagger tagger = geoAlg.ChannelToTaggerEnum(stripHit->Channel());
 
     auto const febData = stripHitToFEBData.at(stripHit.key());
     auto const assnIDEVec = febDataToIDEs.at(febData.key());
@@ -540,8 +545,10 @@ namespace sbnd::crt {
                                                                                  const geo::Vector_t &dir, 
                                                                                  const CRTTagger &tagger)
   {
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     const CoordSet constrainedPlane = CRTCommonUtils::GetTaggerDefinedCoordinate(tagger);
-    const CRTTaggerGeo taggerGeo    = fCRTGeoAlg.GetTagger(CRTCommonUtils::GetTaggerName(tagger));
+    const CRTTaggerGeo taggerGeo    = geoAlg.GetTagger(CRTCommonUtils::GetTaggerName(tagger));
     double k;
 
     switch(constrainedPlane)
@@ -570,14 +577,15 @@ namespace sbnd::crt {
         break;
       }
 
-    if(!fCRTGeoAlg.IsPointInsideCRTLimits(start + k * dir))
+    if(!geoAlg.IsPointInsideCRTLimits(start + k * dir))
       return {999999., {999999., 999999., 999999.}};
 
     return {k, start + k * dir};
   }
 
   void CRTBackTrackerAlg::TrueParticlePDGEnergyTime(const int trackID, int &pdg, double &energy, double &time)
   {
+    art::ServiceHandle<cheat::ParticleInventoryService> particleInv;
     const simb::MCParticle* particle = particleInv->TrackIdToParticle_P(trackID);
 
     pdg    = particle == NULL ? -std::numeric_limits<int>::max()    : particle->PdgCode();

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.cc

@@ -53,6 +53,10 @@ namespace sbnd::crt {
       using Name = fhicl::Name;
       using Comment = fhicl::Comment;
 
+      fhicl::Table<CRTGeoAlg::Config> GeoAlgConfig {
+        Name("CRTGeoAlg"),
+	  };
+
       fhicl::Atom<art::InputTag> SimModuleLabel {
         Name("SimModuleLabel"),
           };
@@ -188,12 +192,12 @@ namespace sbnd::crt {
     };
 
     CRTBackTrackerAlg(const Config& config);
-    
+
+    CRTBackTrackerAlg();
+
     CRTBackTrackerAlg(const fhicl::ParameterSet& pset) :
     CRTBackTrackerAlg(fhicl::Table<Config>(pset, {})()) {}
 
-    CRTBackTrackerAlg();
-
     ~CRTBackTrackerAlg();
 
     void reconfigure(const Config& config);
@@ -228,8 +232,7 @@ namespace sbnd::crt {
 
   private:
 
-    CRTGeoAlg fCRTGeoAlg;
-    art::ServiceHandle<cheat::ParticleInventoryService> particleInv;
+    CRTGeoAlg::Config fCRTGeoAlgConfig;
 
     art::InputTag fSimModuleLabel;
     art::InputTag fSimDepositModuleLabel;