Merge branch 'release/SBN2024A'

miquelnebot · miquelnebot · commit 7c75faf82341 · 2024-03-22T12:36:00.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnobj VERSION 09.18.01.02 LANGUAGES CXX)
+project(sbnobj VERSION 09.19.00 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="
diff --git a/sbnobj/Common/Analysis/CMakeLists.txt b/sbnobj/Common/Analysis/CMakeLists.txt
@@ -1,7 +1,6 @@
-cet_make(
-  LIBRARIES
-    cetlib_except::cetlib_except
-  NO_DICTIONARY
+cet_make_library(
+  SOURCE TPCPurityInfo.cc
+  LIBRARIES cetlib_except::cetlib_except
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_Analysis)
diff --git a/sbnobj/Common/CRT/CMakeLists.txt b/sbnobj/Common/CRT/CMakeLists.txt
@@ -1,8 +1,11 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    CRTHit.cc
+    CRTTrack.cc
+    CRTTzero.cc
   LIBRARIES
     cetlib_except::cetlib_except
     lardataobj::Simulation
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_CRT)
diff --git a/sbnobj/Common/EventGen/MeVPrtl/CMakeLists.txt b/sbnobj/Common/EventGen/MeVPrtl/CMakeLists.txt
@@ -1,10 +1,11 @@
-
-cet_make(
+cet_make_library(
+  SOURCE
+    MeVPrtlTruth.cxx
+    MesonParent.cxx
   LIBRARIES
     cetlib_except::cetlib_except
     nusimdata::SimulationBase
     dk2nu::Tree
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_EventGen_MeVPrtl nusimdata::SimulationBase)
diff --git a/sbnobj/Common/PMT/Data/CMakeLists.txt b/sbnobj/Common/PMT/Data/CMakeLists.txt
@@ -1,7 +1,10 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    PMTconfiguration.cxx
+    V1730Configuration.cxx
+    V1730channelConfiguration.cxx
   LIBRARIES
   lardataobj::RawData
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_PMT_Data)
diff --git a/sbnobj/Common/POTAccounting/CMakeLists.txt b/sbnobj/Common/POTAccounting/CMakeLists.txt
@@ -1,8 +1,11 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    BNBSpillInfo.cc
+    EXTCountInfo.cc
+    NuMISpillInfo.cc
   LIBRARIES
     cetlib_except::cetlib_except
     ROOT::Core
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_POTAccounting)
diff --git a/sbnobj/Common/Reco/CMakeLists.txt b/sbnobj/Common/Reco/CMakeLists.txt
@@ -1,10 +1,24 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    CNNScore.cc
+    CRUMBSResult.cc
+    FlashTriggerPrimitive.cc
+    MVAPID.cc
+    MergedTrackInfo.cc
+    OpT0FinderResult.cc
+    RangeP.cc
+    ScatterClosestApproach.cc
+    ShowerSelectionVars.cc
+    SimpleFlashMatchVars.cc
+    StoppingChi2Fit.cc
+    Stub.cxx
+    TPCPMTBarycenterMatch.cc
+    VertexHit.cc
   LIBRARIES
     cetlib_except::cetlib_except
     messagefacility::MF_MessageLogger
     larcorealg::Geometry
     lardataobj::AnalysisBase
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_Reco)
diff --git a/sbnobj/Common/SBNEventWeight/CMakeLists.txt b/sbnobj/Common/SBNEventWeight/CMakeLists.txt
@@ -1,5 +1,7 @@
-cet_make(
-  NO_DICTIONARY
+cet_make_library(
+  SOURCE
+    EventWeightMap.cc
+    EventWeightParameterSet.cxx
   LIBRARIES
     cetlib_except::cetlib_except
     ROOT::Matrix
@@ -13,4 +15,3 @@ art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_SBNEventWeight)
 
 install_headers()
 install_source()
-
diff --git a/sbnobj/Common/Trigger/CMakeLists.txt b/sbnobj/Common/Trigger/CMakeLists.txt
@@ -1,7 +1,8 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    ExtraTriggerInfo.cxx
   LIBRARIES
     ROOT::Core
-  NO_DICTIONARY
 )
 
 
diff --git a/sbnobj/ICARUS/CRT/CMakeLists.txt b/sbnobj/ICARUS/CRT/CMakeLists.txt
@@ -1,8 +1,9 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    CRTData.cc
   LIBRARIES
     cetlib_except::cetlib_except
     lardataobj::Simulation
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::ICARUS_CRT)
diff --git a/sbnobj/ICARUS/PMT/Data/CMakeLists.txt b/sbnobj/ICARUS/PMT/Data/CMakeLists.txt
@@ -1,6 +1,5 @@
-cet_make(
-  LIBRARIES
-  NO_DICTIONARY
+cet_make_library(
+  SOURCE WaveformBaseline.cxx
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::ICARUS_PMT_Data lardataobj::RawData)
diff --git a/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt b/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt
@@ -1,10 +1,13 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    MultiChannelOpticalTriggerGate.cxx
+    OpticalTriggerGate.cxx
+    SingleChannelOpticalTriggerGate.cxx
   LIBRARIES
     lardataalg::UtilitiesHeaders
     lardataobj::RawData
     larcorealg::CoreUtils
     cetlib_except::cetlib_except
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::ICARUS_PMT_Trigger_Data)
diff --git a/sbnobj/SBND/CRT/CMakeLists.txt b/sbnobj/SBND/CRT/CMakeLists.txt
@@ -1,9 +1,17 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    CRTCluster.cxx
+    CRTData.cxx
+    CRTEnums.cxx
+    CRTSpacePoint.cxx
+    CRTStripHit.cxx
+    CRTTrack.cxx
+    FEBData.cxx
+    FEBTruthInfo.cxx
   LIBRARIES
     cetlib_except::cetlib_except
     lardataobj::Simulation
     lardataobj::RecoBase
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj::SBND_CRT)
diff --git a/sbnobj/SBND/Commissioning/CMakeLists.txt b/sbnobj/SBND/Commissioning/CMakeLists.txt
@@ -1,7 +1,8 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    MuonTrack.cc
   LIBRARIES
     cetlib_except::cetlib_except
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj_SBND_Commissioning lardataobj::RecoBase)
diff --git a/sbnobj/SBND/Timing/CMakeLists.txt b/sbnobj/SBND/Timing/CMakeLists.txt
@@ -1,7 +1,8 @@
-cet_make( 
+cet_make_library(
+  SOURCE
+    DAQTimestamp.cxx
   LIBRARIES
     cetlib_except::cetlib_except
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj_SBND_Timing)
diff --git a/sbnobj/SBND/ToF/CMakeLists.txt b/sbnobj/SBND/ToF/CMakeLists.txt
@@ -1,7 +1,8 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    ToF.cc
   LIBRARIES
     cetlib_except::cetlib_except
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj_SBND_ToF)
diff --git a/sbnobj/SBND/Trigger/CMakeLists.txt b/sbnobj/SBND/Trigger/CMakeLists.txt
@@ -1,7 +1,8 @@
-cet_make(
+cet_make_library(
+  SOURCE
+    pmtTrigger.cc
   LIBRARIES
     cetlib_except::cetlib_except
-  NO_DICTIONARY
   )
 
 art_dictionary(DICTIONARY_LIBRARIES sbnobj_SBND_Trigger)
diff --git a/sbnobj/SBND/Trigger/CRTmetric.cc b/sbnobj/SBND/Trigger/CRTmetric.cc
diff --git a/sbnobj/SBND/Trigger/CRTmetric.hh b/sbnobj/SBND/Trigger/CRTmetric.hh
diff --git a/sbnobj/SBND/Trigger/classes.h b/sbnobj/SBND/Trigger/classes.h
@@ -1,8 +1,6 @@
 #include "canvas/Persistency/Common/Wrapper.h"
 #include "canvas/Persistency/Common/Assns.h"
 #include "sbnobj/SBND/Trigger/pmtTrigger.hh"
-#include "sbnobj/SBND/Trigger/pmtSoftwareTrigger.hh"
-#include "sbnobj/SBND/Trigger/CRTmetric.hh"
 #include <vector>
 #include <map>
 #include <utility>
diff --git a/sbnobj/SBND/Trigger/classes_def.xml b/sbnobj/SBND/Trigger/classes_def.xml
@@ -8,23 +8,4 @@
   <class name="std::vector<sbnd::comm::pmtTrigger>"/>
   <class name="art::Wrapper< std::vector<sbnd::comm::pmtTrigger> >"/>
   
-  <class name="sbnd::trigger::pmtSoftwareTrigger"/>
-  <class name="art::Wrapper<sbnd::trigger::pmtSoftwareTrigger>"/>
-  <class name="std::vector<sbnd::trigger::pmtSoftwareTrigger>"/>
-  <class name="art::Wrapper< std::vector<sbnd::trigger::pmtSoftwareTrigger> >"/>
-
-  <class name="sbnd::trigger::pmtPulse"/>
-  <class name="art::Wrapper<sbnd::trigger::pmtPulse>"/>
-  <class name="std::vector<sbnd::trigger::pmtPulse>"/>
-  <class name="art::Wrapper< std::vector<sbnd::trigger::pmtPulse> >"/>  
-
-  <class name="sbnd::trigger::pmtInfo"/>
-  <class name="art::Wrapper<sbnd::trigger::pmtInfo>"/>
-  <class name="std::vector<sbnd::trigger::pmtInfo>"/>
-  <class name="art::Wrapper< std::vector<sbnd::trigger::pmtInfo> >"/>
-
-  <class name="sbndaq::CRTmetric"/>
-  <class name="art::Wrapper<sbndaq::CRTmetric>"/>
-  <class name="std::vector<sbndaq::CRTmetric>"/>
-  <class name="art::Wrapper< std::vector<sbndaq::CRTmetric> >"/>
 </lcgdict>
diff --git a/sbnobj/SBND/Trigger/pmtSoftwareTrigger.cc b/sbnobj/SBND/Trigger/pmtSoftwareTrigger.cc
diff --git a/sbnobj/SBND/Trigger/pmtSoftwareTrigger.hh b/sbnobj/SBND/Trigger/pmtSoftwareTrigger.hh
diff --git a/ups/product_deps b/ups/product_deps
@@ -246,8 +246,8 @@ defaultqual	e26
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-lardataobj	v09_17_03	-
-cetmodules	v3_21_01	-	only_for_build
+lardataobj	v09_18_01	-
+cetmodules	v3_24_01	-	only_for_build
 end_product_list
 ####################################
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`		`-cet_make(`
	`1`	`+cet_make_library(`
	`2`	`+ SOURCE`
	`3`	`+ ExtraTriggerInfo.cxx`
`2`	`4`	`LIBRARIES`
`3`	`5`	`ROOT::Core`
`4`		`- NO_DICTIONARY`
`5`	`6`	`)`
`6`	`7`
`7`	`8`