Skip to content

Imported AssnsCrosser algorithm from icarusalg [3/3] #825

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.

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ find_package(ifbeam REQUIRED )
find_package(ifdhc REQUIRED )
find_package(ifdh_art REQUIRED )
find_package(Range-v3 REQUIRED )
find_package(sbnalg REQUIRED )
find_package(sbnobj REQUIRED )
find_package(icarus_signal_processing REQUIRED )
find_package(icarusalg REQUIRED )
Expand Down
1 change: 1 addition & 0 deletions icaruscode/Analysis/trigger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ cet_build_plugin(TimeTrackTreeStorageCRT art::module
icaruscode_CRTUtils
icaruscode::PMT_Algorithms
icaruscode::Decode_DataProducts
sbnalg::Utilities
larcore::Geometry_Geometry_service
larcorealg::Geometry
lardataobj::AnalysisBase
Expand Down
4 changes: 2 additions & 2 deletions icaruscode/Analysis/trigger/TimeTrackTreeStorageCRT_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "icaruscode/Utilities/TrajectoryUtils.h"
#include "icaruscode/Utilities/ArtAssociationCaches.h" // OneToOneAssociationCache
#include "icarusalg/Utilities/TrackTimeInterval.h"
#include "icarusalg/Utilities/AssnsCrosser.h"
#include "sbnalg/Utilities/AssnsCrosser.h"
#include "sbnobj/Common/CRT/CRTHit.hh"
#include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"

Expand Down Expand Up @@ -697,7 +697,7 @@ void sbn::TimeTrackTreeStorage::analyze(art::Event const& e)
art::FindOneP<anab::T0> TrackT0s(tracks,e,fT0selProducer);

// t0 from TPC (cathode crossing tracks)
icarus::ns::util::AssnsCrosser<recob::Track, recob::PFParticle, anab::T0> const
sbn::ns::util::AssnsCrosser<recob::Track, recob::PFParticle, anab::T0> const
TrackTPCt0s{ e, fPFPproducer, fT0Producer };

// optical flashes
Expand Down
2 changes: 1 addition & 1 deletion icaruscode/PMT/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ cet_build_plugin(ReassociatePMTbaselines art::module
icaruscode::IcarusObj
icaruscode::PMT_Algorithms
icaruscode::PMT_Data
icarusalg::Utilities
sbnalg::Utilities
sbnobj::ICARUS_PMT_Data
lardata::headers
lardataalg::headers
Expand Down
8 changes: 4 additions & 4 deletions icaruscode/PMT/ReassociatePMTbaselines_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "icaruscode/PMT/Algorithms/OpDetWaveformMetaUtils.h" // OpDetWaveformMetaMaker
#include "icaruscode/PMT/Data/WaveformRMS.h"
#include "icaruscode/IcarusObj/OpDetWaveformMeta.h"
#include "icarusalg/Utilities/AssnsCrosser.h"
#include "sbnalg/Utilities/AssnsCrosser.h"
#include "sbnobj/ICARUS/PMT/Data/WaveformBaseline.h"

// LArSoft libraries
Expand Down Expand Up @@ -480,9 +480,9 @@ void icarus::trigger::ReassociatePMTbaselines::produce

// associate original metadata with (original) baselines:
auto const metaToBaseline = makeAssnsCrosser(event,
icarus::ns::util::startFrom<sbn::OpDetWaveformMeta>{}
, icarus::ns::util::hopTo <raw::OpDetWaveform>{ fOriginalWaveformTag }
, icarus::ns::util::hopTo <icarus::WaveformBaseline>{ fBaselineTag }
sbn::ns::util::startFrom<sbn::OpDetWaveformMeta>{}
, sbn::ns::util::hopTo <raw::OpDetWaveform>{ fOriginalWaveformTag }
, sbn::ns::util::hopTo <icarus::WaveformBaseline>{ fBaselineTag }
);

// find which original metadata we need
Expand Down