Skip to content

Removed inappropriate repository dependencies #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PetrilloAtWork wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Removed inappropriate repository dependencies #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

Copilot AI Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's an inconsistency in spacing after "find_package(" compared to the line below. The original code had consistent spacing, but line 38 now has a space after the opening parenthesis while line 39 does not. Consider making the spacing consistent for better code style.

Suggested change
find_package( canvas REQUIRED EXPORT)
find_package(canvas REQUIRED EXPORT)

Copilot uses AI. Check for mistakes.
Copy link
Member Author

@PetrilloAtWork PetrilloAtWork Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's consistent with all the other existing lines, so it stays.

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 )
Expand Down
2 changes: 1 addition & 1 deletion sbnobj/Common/CRT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions sbnobj/Common/CRT/CRTHitT0TaggingInfo.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

// C/C++ standard libraries
#include <limits>
#include "larcorealg/Geometry/GeometryCore.h"
#include "larcoreobj/SimpleTypesAndConstants/geo_types.h"
#include "larcoreobj/SimpleTypesAndConstants/geo_vectors.h"
// -----------------------------------------------------------------------------
namespace sbn::crt {
Expand Down Expand Up @@ -100,4 +98,4 @@ struct sbn::crt::CRTHitT0TaggingInfo {
// -----------------------------------------------------------------------------


#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_
#endif // SBNOBJ_COMMON_CRTHitT0TaggingInfo_hh_
7 changes: 2 additions & 5 deletions sbnobj/Common/CRT/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion sbnobj/Common/Reco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ cet_make_library(
LIBRARIES
cetlib_except::cetlib_except
messagefacility::MF_MessageLogger
larcorealg::Geometry
lardataobj::AnalysisBase
)

Expand Down
11 changes: 0 additions & 11 deletions sbnobj/Common/Utilities/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions sbnobj/ICARUS/PMT/Trigger/Data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ cet_make_library(
OpticalTriggerGate.cxx
SingleChannelOpticalTriggerGate.cxx
LIBRARIES
lardataalg::UtilitiesHeaders
lardataobj::RawData
larcorealg::CoreUtils
cetlib_except::cetlib_except
)

Expand Down
8 changes: 5 additions & 3 deletions sbnobj/ICARUS/PMT/Trigger/Data/OpticalTriggerGate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions sbnobj/ICARUS/TPC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down