Merge branch 'release/v09_93_01_02p02'

Author: Brinden Carlson

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.02)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.02.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.93.01.02)
+# project(sbndcode VERSION 09.93.01.02.02)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")
@@ -80,6 +80,7 @@ find_package( larcore REQUIRED )
 find_package( larcorealg REQUIRED )
 find_package( larcoreobj REQUIRED )
 find_package( larreco REQUIRED )
+find_package( larrecodnn REQUIRED )
 find_package( larana REQUIRED )
 find_package( PostgreSQL REQUIRED )
 find_package( hep_concurrency REQUIRED )

sbndcode/CMakeLists.txt

@@ -42,3 +42,6 @@ add_subdirectory(WireCell)
 
 add_subdirectory(Decoders)
 add_subdirectory(ChannelMaps)
+
+# for CVN
+add_subdirectory(SBNDCVN)

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -39,6 +39,7 @@
 #include "sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h"
 #include "sbndcode/CRT/CRTUtils/CRTCommonUtils.h"
 #include "sbndcode/Decoders/PTB/sbndptb.h"
+#include "sbndcode/Timing/SBNDRawTimingObj.h"
 
 namespace sbnd::crt {
   class CRTAnalysis;
@@ -94,7 +95,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   std::string fMCParticleModuleLabel, fSimDepositModuleLabel, fFEBDataModuleLabel, fCRTStripHitModuleLabel,
     fCRTClusterModuleLabel, fCRTSpacePointModuleLabel, fCRTTrackModuleLabel, fTPCTrackModuleLabel,
     fCRTSpacePointMatchingModuleLabel, fCRTTrackMatchingModuleLabel, fPFPModuleLabel, fPTBModuleLabel,
-    fTDCModuleLabel;
+    fTDCModuleLabel, fTimingReferenceModuleLabel;
   bool fDebug, fDataMode, fNoTPC, fHasPTB, fHasTDC;
 
   TTree* fTree;
@@ -104,6 +105,8 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
   int _run;
   int _subrun;
   int _event;
+  int _crt_timing_reference_type;
+  int _crt_timing_reference_channel;
 
   //mc truth
   std::vector<int16_t>              _mc_trackid;
@@ -331,6 +334,7 @@ sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
   fPFPModuleLabel                   = p.get<std::string>("PFPModuleLabel", "pandora");
   fPTBModuleLabel                   = p.get<std::string>("PTBModuleLabel", "ptbdecoder");
   fTDCModuleLabel                   = p.get<std::string>("TDCModuleLabel", "tdcdecoder");
+  fTimingReferenceModuleLabel       = p.get<std::string>("TimingReferenceModuleLabel", "crtstrips");
   fDebug                            = p.get<bool>("Debug", false);
   fDataMode                         = p.get<bool>("DataMode", false);
   fNoTPC                            = p.get<bool>("NoTPC", false);
@@ -346,6 +350,8 @@ sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
   fTree->Branch("run", &_run);
   fTree->Branch("subrun", &_subrun);
   fTree->Branch("event", &_event);
+  fTree->Branch("crt_timing_reference_type", &_crt_timing_reference_type);
+  fTree->Branch("crt_timing_reference_channel", &_crt_timing_reference_channel);
 
   if(!fDataMode)
     {
@@ -621,6 +627,17 @@ void sbnd::crt::CRTAnalysis::analyze(art::Event const& e)
 
   if(fDebug) std::cout << "This is event " << _run << "-" << _subrun << "-" << _event << std::endl;
 
+  _crt_timing_reference_type    = -1;
+  _crt_timing_reference_channel = -1;
+
+  art::Handle<raw::TimingReferenceInfo> TimingReferenceHandle;
+  e.getByLabel(fTimingReferenceModuleLabel, TimingReferenceHandle);
+  if(TimingReferenceHandle.isValid())
+    {
+      _crt_timing_reference_type    = TimingReferenceHandle->timingType;
+      _crt_timing_reference_channel = TimingReferenceHandle->timingChannel;
+    }
+
   if(fHasPTB)
     {
       // Get PTBs

sbndcode/CRT/CRTReco/CMakeLists.txt

@@ -7,6 +7,7 @@ art_make_library(
 
 simple_plugin(
               CRTStripHitProducer module
+              artdaq_core::artdaq-core_Data
               sbnobj::SBND_CRT
               sbnobj::SBND_Timing
               sbndcode_GeoWrappers