From 293f12cb6916b48953ca76a71143c1bbfd216a9f Mon Sep 17 00:00:00 2001 From: Gianluca Petrillo Date: Mon, 22 Dec 2025 12:56:53 -0600 Subject: [PATCH] Removed inappropriate repository dependencies Minor modifications to the code were required. --- CMakeLists.txt | 9 ++------- sbnobj/Common/CRT/CMakeLists.txt | 2 +- sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh | 4 +--- sbnobj/Common/CRT/classes.h | 7 ++----- sbnobj/Common/Reco/CMakeLists.txt | 1 - sbnobj/Common/Utilities/CMakeLists.txt | 11 ----------- sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt | 2 -- sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h | 8 +++++--- sbnobj/ICARUS/TPC/CMakeLists.txt | 7 ++----- 9 files changed, 13 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6886841e7..0e5ade0e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,16 +34,11 @@ cet_set_compiler_flags(DIAGS CAUTIOUS cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE) # these are minimum required versions, not the actual product versions -find_package(art REQUIRED EXPORT) -find_package(canvas REQUIRED EXPORT) +# this package must NOT depend on art, nor on the *alg LArSoft packages +find_package( canvas REQUIRED EXPORT) find_package( messagefacility REQUIRED ) -find_package( canvas REQUIRED ) -find_package( larcore REQUIRED ) find_package( larcoreobj REQUIRED ) -find_package( lardata REQUIRED ) find_package( lardataobj REQUIRED ) -find_package( larcorealg REQUIRED ) -find_package( lardataalg REQUIRED ) find_package( nusimdata REQUIRED ) find_package( Boost COMPONENTS system ) find_package( ROOT REQUIRED ) diff --git a/sbnobj/Common/CRT/CMakeLists.txt b/sbnobj/Common/CRT/CMakeLists.txt index 979ce3932..5770cab50 100644 --- a/sbnobj/Common/CRT/CMakeLists.txt +++ b/sbnobj/Common/CRT/CMakeLists.txt @@ -9,7 +9,7 @@ cet_make_library( LIBRARIES cetlib_except::cetlib_except lardataobj::Simulation - larcorealg::Geometry + larcoreobj::geo_vectors ) art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_CRT) diff --git a/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh b/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh index 9247d30ca..c072c132b 100644 --- a/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh +++ b/sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh @@ -9,8 +9,6 @@ // C/C++ standard libraries #include -#include "larcorealg/Geometry/GeometryCore.h" -#include "larcoreobj/SimpleTypesAndConstants/geo_types.h" #include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h" // ----------------------------------------------------------------------------- namespace sbn::crt { @@ -100,4 +98,4 @@ struct sbn::crt::CRTHitT0TaggingInfo { // ----------------------------------------------------------------------------- -#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_ \ No newline at end of file +#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_ diff --git a/sbnobj/Common/CRT/classes.h b/sbnobj/Common/CRT/classes.h index 8fab95e32..0f67e61cf 100644 --- a/sbnobj/Common/CRT/classes.h +++ b/sbnobj/Common/CRT/classes.h @@ -2,14 +2,11 @@ #include "canvas/Persistency/Common/Assns.h" #include "lardataobj/RecoBase/Track.h" #include "lardataobj/RecoBase/PFParticle.h" -#include "lardataobj/AnalysisBase/T0.h" +#include "lardataobj/RecoBase/OpFlash.h" #include "lardataobj/Simulation/AuxDetSimChannel.h" -#include "lardataobj/RecoBase/Track.h" -#include "lardataobj/RecoBase/PFParticle.h" +#include "lardataobj/AnalysisBase/T0.h" #include "sbnobj/Common/CRT/CRTHit.hh" #include "sbnobj/Common/CRT/CRTTrack.hh" -#include "lardataobj/AnalysisBase/T0.h" -#include "lardataobj/RecoBase/OpFlash.h" #include "sbnobj/Common/CRT/CRTTzero.hh" #include "sbnobj/Common/CRT/CRTPMTMatching.hh" #include "sbnobj/Common/CRT/CRTHit_Legacy.hh" diff --git a/sbnobj/Common/Reco/CMakeLists.txt b/sbnobj/Common/Reco/CMakeLists.txt index bcdd52a1f..4d334a7f7 100644 --- a/sbnobj/Common/Reco/CMakeLists.txt +++ b/sbnobj/Common/Reco/CMakeLists.txt @@ -17,7 +17,6 @@ cet_make_library( LIBRARIES cetlib_except::cetlib_except messagefacility::MF_MessageLogger - larcorealg::Geometry lardataobj::AnalysisBase ) diff --git a/sbnobj/Common/Utilities/CMakeLists.txt b/sbnobj/Common/Utilities/CMakeLists.txt index c9a710785..bf5d091c9 100644 --- a/sbnobj/Common/Utilities/CMakeLists.txt +++ b/sbnobj/Common/Utilities/CMakeLists.txt @@ -2,19 +2,8 @@ cet_make_library( SOURCE ChannelROICreator.cxx LIBRARIES - cetlib_except::cetlib_except - messagefacility::MF_MessageLogger sbnobj::ICARUS_TPC - larcore::Geometry_Geometry_service - larcorealg::Geometry - lardata::ArtDataHelper lardataobj::AnalysisBase - art::Framework_Core - art::Framework_Principal - art::Framework_Services_Registry - art::Persistency_Common - art::Persistency_Provenance - art::Utilities ) install_headers() diff --git a/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt b/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt index 0508b9c13..e8bfe201c 100644 --- a/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt +++ b/sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt @@ -4,9 +4,7 @@ cet_make_library( OpticalTriggerGate.cxx SingleChannelOpticalTriggerGate.cxx LIBRARIES - lardataalg::UtilitiesHeaders lardataobj::RawData - larcorealg::CoreUtils cetlib_except::cetlib_except ) diff --git a/sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h b/sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h index 6a36206ea..27a3e46dc 100644 --- a/sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h +++ b/sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h @@ -15,7 +15,6 @@ #include "sbnobj/ICARUS/PMT/Trigger/Data/ReadoutTriggerGate.h" // LArSoft libraries -#include "lardataalg/Utilities/quantities/electronics.h" // tick #include "lardataobj/RawData/OpDetWaveform.h" // C/C++ standard libraries @@ -33,8 +32,11 @@ namespace icarus::trigger { class OpticalTriggerGate; std::ostream& operator<< (std::ostream&, OpticalTriggerGate const&); - using TriggerGateTick_t = util::quantities::tick::value_t; ///< Tick point. - using TriggerGateTicks_t = util::quantities::tick::value_t; ///< Tick interval. + /// Tick point (copy of `util::quantities::tick::value_t`). + using TriggerGateTick_t = std::ptrdiff_t; + + /// Tick interval (copy of `util::quantities::tick::value_t`). + using TriggerGateTicks_t = TriggerGateTick_t; /// Type of trigger gate data serialized into _art_ data products. using OpticalTriggerGateData_t = icarus::trigger::ReadoutTriggerGate diff --git a/sbnobj/ICARUS/TPC/CMakeLists.txt b/sbnobj/ICARUS/TPC/CMakeLists.txt index 6565d5771..d13a95e71 100644 --- a/sbnobj/ICARUS/TPC/CMakeLists.txt +++ b/sbnobj/ICARUS/TPC/CMakeLists.txt @@ -2,16 +2,13 @@ file(GLOB lib_srcs *.cxx) cet_make_library(SOURCE ${lib_srcs} LIBRARIES - PRIVATE + PUBLIC larcoreobj::headers lardataobj::headers ) art_dictionary(DICTIONARY_LIBRARIES - sbnobj::ICARUS_TPC - lardataobj::RecoBase - lardataalg::headers - canvas::canvas + sbnobj::ICARUS_TPC ) install_headers()