Skip to content

Commit

Permalink
Switch to TrackerHit3D after renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener committed Feb 6, 2024
1 parent 1e4efc3 commit 1931e93
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ template <typename K, typename V> using ObjMapT = k4EDM4hep2LcioConv::VecMapT<K,
using TrackMap = ObjMapT<lcio::TrackImpl*, edm4hep::Track>;
using ClusterMap = ObjMapT<lcio::ClusterImpl*, edm4hep::Cluster>;
using VertexMap = ObjMapT<lcio::VertexImpl*, edm4hep::Vertex>;
using TrackerHitMap = ObjMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit>;
using TrackerHitMap = ObjMapT<lcio::TrackerHitImpl*, edm4hep::TrackerHit3D>;
using SimTrackerHitMap = ObjMapT<lcio::SimTrackerHitImpl*, edm4hep::SimTrackerHit>;
using CaloHitMap = ObjMapT<lcio::CalorimeterHitImpl*, edm4hep::CalorimeterHit>;
using SimCaloHitMap = ObjMapT<lcio::SimCalorimeterHitImpl*, edm4hep::SimCalorimeterHit>;
Expand Down
4 changes: 2 additions & 2 deletions k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ void EDM4hep2LcioTool::convertTracks(TrackMap& tracks_vec, const TrackerHitMap&
// Add LCIO Collection Vector to LCIO event
void EDM4hep2LcioTool::convertTrackerHits(TrackerHitMap& trackerhits_vec, const std::string& e4h_coll_name,
const std::string& lcio_coll_name, lcio::LCEventImpl* lcio_event) {
DataHandle<edm4hep::TrackerHitCollection> trackerhits_handle{e4h_coll_name, Gaudi::DataHandle::Reader, this};
const auto trackerhits_coll = trackerhits_handle.get();
DataHandle<edm4hep::TrackerHit3DCollection> trackerhits_handle{e4h_coll_name, Gaudi::DataHandle::Reader, this};
const auto trackerhits_coll = trackerhits_handle.get();

MetaDataHandle<std::string> cellIDStrHandle{trackerhits_handle, edm4hep::CellIDEncoding, Gaudi::DataHandle::Reader};

Expand Down
2 changes: 1 addition & 1 deletion k4MarlinWrapper/src/components/GlobalConvertedObjectsMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace k4MarlinWrapper {
template <typename K, typename V> using ObjectMapT = k4EDM4hep2LcioConv::VecMapT<K, V>;

ObjectMapT<EVENT::Track*, edm4hep::Track> tracks{};
ObjectMapT<EVENT::TrackerHit*, edm4hep::TrackerHit> trackerHits{};
ObjectMapT<EVENT::TrackerHit*, edm4hep::TrackerHit3D> trackerHits{};
ObjectMapT<EVENT::SimTrackerHit*, edm4hep::SimTrackerHit> simTrackerHits{};
ObjectMapT<EVENT::CalorimeterHit*, edm4hep::CalorimeterHit> caloHits{};
ObjectMapT<EVENT::RawCalorimeterHit*, edm4hep::RawCalorimeterHit> rawCaloHits{};
Expand Down
2 changes: 1 addition & 1 deletion k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ namespace {

struct ObjectMappings {
ObjMapT<lcio::Track*, edm4hep::MutableTrack> tracks{};
ObjMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit> trackerHits{};
ObjMapT<lcio::TrackerHit*, edm4hep::MutableTrackerHit3D> trackerHits{};
ObjMapT<lcio::SimTrackerHit*, edm4hep::MutableSimTrackerHit> simTrackerHits{};
ObjMapT<lcio::CalorimeterHit*, edm4hep::MutableCalorimeterHit> caloHits{};
ObjMapT<lcio::RawCalorimeterHit*, edm4hep::MutableRawCalorimeterHit> rawCaloHits{};
Expand Down

0 comments on commit 1931e93

Please sign in to comment.