Skip to content

Commit 3bb766f

Browse files
jmcarcellandresailer
authored andcommitted
Fix a deprecation warning in EDM4hepReader.cpp: rename isValid to hasID
1 parent b3f319d commit 3bb766f

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

DDG4/edm4hep/EDM4hepFileReader.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,14 @@ namespace dd4hep::sim {
191191
podio::Frame frame = m_reader.readFrame("events", event_number);
192192
const auto& primaries = frame.get<edm4hep::MCParticleCollection>(m_collectionName);
193193
int eventNumber = event_number, runNumber = 0;
194+
#if PODIO_BUILD_VERSION >= PODIO_VERSION(1, 6, 0)
195+
if (primaries.hasID()) {
196+
#else
194197
if (primaries.isValid()) {
198+
#endif
195199
//Read the event header collection and add it to the context as an extension
196200
const auto& eventHeaderCollection = frame.get<edm4hep::EventHeaderCollection>(m_eventHeaderCollectionName);
197-
if(eventHeaderCollection.isValid() && eventHeaderCollection.size() == 1){
201+
if(eventHeaderCollection.size() == 1){
198202
const auto& eh = eventHeaderCollection.at(0);
199203
eventNumber = eh.getEventNumber();
200204
runNumber = eh.getRunNumber();
@@ -224,8 +228,13 @@ namespace dd4hep::sim {
224228
}
225229
#if EDM4HEP_BUILD_VERSION >= EDM4HEP_VERSION(0, 99, 3)
226230
// Attach the GeneratorEventParameters if they are available
227-
const auto &genEvtParameters = frame.get<edm4hep::GeneratorEventParametersCollection>(edm4hep::labels::GeneratorEventParameters);
231+
const auto& genEvtParameters =
232+
frame.get<edm4hep::GeneratorEventParametersCollection>(edm4hep::labels::GeneratorEventParameters);
233+
#if PODIO_BUILD_VERSION >= PODIO_VERSION(1, 6, 0)
234+
if (genEvtParameters.hasID()) {
235+
#else
228236
if (genEvtParameters.isValid()) {
237+
#endif
229238
if (genEvtParameters.size() >= 1) {
230239
const auto genParams = genEvtParameters[0];
231240
try {

0 commit comments

Comments
 (0)