Skip to content

Commit

Permalink
Rename convEvent function to convertEvent
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener committed Feb 21, 2024
1 parent 4ee15ab commit 21e98b8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,17 @@ namespace EDM4hep2LCIOConv {
/**
* Convert an edm4hep event to an LCEvent
*/
std::unique_ptr<lcio::LCEventImpl> convEvent(
std::unique_ptr<lcio::LCEventImpl> convertEvent(
const podio::Frame& edmEvent,
const podio::Frame& metadata = podio::Frame {});

[[deprecated("Use convertEvent")]] std::unique_ptr<lcio::LCEventImpl> convEvent(
const podio::Frame& edmEvent,
const podio::Frame& metadata = podio::Frame {})
{
return convertEvent(edmEvent, metadata);
}

} // namespace EDM4hep2LCIOConv

#include "k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.ipp"
Expand Down
2 changes: 1 addition & 1 deletion k4EDM4hep2LcioConv/src/k4EDM4hep2LcioConv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace EDM4hep2LCIOConv {
return std::find(coll->begin(), coll->end(), collection_name) != coll->end();
}

std::unique_ptr<lcio::LCEventImpl> convEvent(const podio::Frame& edmEvent, const podio::Frame& metadata)
std::unique_ptr<lcio::LCEventImpl> convertEvent(const podio::Frame& edmEvent, const podio::Frame& metadata)
{
auto lcioEvent = std::make_unique<lcio::LCEventImpl>();
auto objectMappings = CollectionsPairVectors {};
Expand Down
2 changes: 1 addition & 1 deletion tests/edm4hep_roundtrip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
int main()
{
const auto origEvent = createExampleEvent();
const auto lcioEvent = EDM4hep2LCIOConv::convEvent(origEvent);
const auto lcioEvent = EDM4hep2LCIOConv::convertEvent(origEvent);
const auto roundtripEvent = LCIO2EDM4hepConv::convertEvent(lcioEvent.get());

ASSERT_SAME_OR_ABORT(edm4hep::CalorimeterHitCollection, "caloHits");
Expand Down
2 changes: 1 addition & 1 deletion tests/edm4hep_to_lcio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
int main()
{
const auto edmEvent = createExampleEvent();
const auto lcioEvent = EDM4hep2LCIOConv::convEvent(edmEvent);
const auto lcioEvent = EDM4hep2LCIOConv::convertEvent(edmEvent);

if (!compareEventHeader(lcioEvent.get(), &edmEvent)) {
return 1;
Expand Down

0 comments on commit 21e98b8

Please sign in to comment.