Add check for existence before getting collections

AIDASoft · Sep 18, 2023 · 3f1dbb3 · 3f1dbb3
1 parent 294ef3f
commit 3f1dbb3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/include/podio/CollectionIDTable.h b/include/podio/CollectionIDTable.h
@@ -34,6 +34,9 @@ class CollectionIDTable {
   /// Check if collection name is known
   bool present(const std::string& name) const;
 
+  /// Check if collection ID is known
+  bool present(uint32_t collectionID) const;
+
   /// return registered names
   const std::vector<std::string>& names() const {
     return m_names;

diff --git a/include/podio/Frame.h b/include/podio/Frame.h
@@ -400,6 +400,9 @@ podio::CollectionBase* Frame::FrameModel<FrameDataT>::doGet(const std::string& n
 
 template <typename FrameDataT>
 bool Frame::FrameModel<FrameDataT>::get(uint32_t collectionID, CollectionBase*& collection) const {
+  if (!m_idTable.present(collectionID)) {
+    return false;
+  }
   const auto& name = m_idTable.name(collectionID);
   const auto& [_, inserted] = m_retrievedIDs.insert(collectionID);
 

diff --git a/src/CollectionIDTable.cc b/src/CollectionIDTable.cc
@@ -1,10 +1,11 @@
 // podio specific includes
 #include "podio/CollectionIDTable.h"
-#include <algorithm>
-#include <iostream>
 
 #include "MurmurHash3.h"
 
+#include <algorithm>
+#include <iostream>
+
 namespace podio {
 
 CollectionIDTable::CollectionIDTable() : m_mutex(std::make_unique<std::mutex>()) {
@@ -46,6 +47,11 @@ bool CollectionIDTable::present(const std::string& name) const {
   return result != end(m_names);
 }
 
+bool CollectionIDTable::present(uint32_t collectionID) const {
+  std::lock_guard<std::mutex> lock{*m_mutex};
+  return std::find(m_collectionIDs.begin(), m_collectionIDs.end(), collectionID) != m_collectionIDs.end();
+}
+
 uint32_t CollectionIDTable::add(const std::string& name) {
   std::lock_guard<std::mutex> lock(*m_mutex);
   const auto result = std::find(begin(m_names), end(m_names), name);