Skip to content
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

Make podio type name calls future string_view proof #1124

Merged
merged 1 commit into from
Jun 2, 2023
Merged
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
2 changes: 1 addition & 1 deletion DDDigi/io/DigiEdm4hepInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ namespace dd4hep {
data_io<edm4hep_input>()._to_digi_if(*collection, hits, predicate);
data_io<edm4hep_input>()._to_digi(Key(nam, segment.id, mask), hits, out);
info("%s+++ %-24s Converted %6ld Edm4hep %-14s to %6ld cell deposits",
context.event->id(), nam.c_str(), len, collection->getValueTypeName().c_str(), out.size());
context.event->id(), nam.c_str(), len, collection->getValueTypeName().data(), out.size());
put_data(segment, Key(out.name, mask), std::move(out));
if ( m_keep_raw ) {
put_data(segment, Key(nam+".edm4hep", mask, segment.id), std::move(hits));
Expand Down
6 changes: 3 additions & 3 deletions DDDigi/io/DigiEdm4hepOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace dd4hep {
template <typename T> T* DigiEdm4hepOutput::internals_t::register_collection(const std::string& nam, T* coll) {
m_collections.emplace(nam, coll);
m_store->registerCollection(nam, coll);
m_parent->debug("+++ created collection %s <%s>", nam.c_str(), coll->getTypeName().c_str());
m_parent->debug("+++ created collection %s <%s>", nam.c_str(), coll->getTypeName().data());
return coll;
}

Expand Down Expand Up @@ -235,7 +235,7 @@ namespace dd4hep {
std::size_t end = internals->m_particles->size();
info("%s+++ %-24s added %6ld/%6ld entries from mask: %04X to %s",
ctxt.event->id(), cont.name.c_str(), end-start, end, cont.key.mask(),
coll->getTypeName().c_str());
coll->getTypeName().data());
}

template <typename T> void
Expand Down Expand Up @@ -288,7 +288,7 @@ namespace dd4hep {
std::size_t end = coll->size();
info("%s+++ %-24s added %6ld/%6ld entries from mask: %04X to %s",
ctxt.event->id(), cont.name.c_str(), end-start, end, cont.key.mask(),
coll->getTypeName().c_str());
coll->getTypeName().data());
}

void DigiEdm4hepOutputProcessor::convert_history(DigiContext& ctxt,
Expand Down