Protecting collection retrieval by mutex

analyzers/dataframe/src/Track.cc

@@ -43,10 +43,6 @@ namespace FCCAnalyses {
     getD0 (const edm4hep::TrackCollection& inColl) {
       ROOT::VecOps::RVec<std::size_t> result;
       for (const auto& track: inColl) {
-        if (track.getTrackStates().size() > 1) {
-          std::cout << "Track with more than one state encountered!"
-                    << std::endl;
-        }
         for (const auto& trackState: track.getTrackStates()) {
           result.push_back(trackState.D0);
           break;

e4hsource/include/EDM4hepSource/EDM4hepLegacySource.hxx

@@ -2,10 +2,11 @@
 #define EDM4HEP_LEGACY_SOURCE_H__
 
 // STL
+#include <memory>
 #include <vector>
 #include <string>
 #include <functional>
-#include <shared_mutex>
+#include <mutex>
 
 // ROOT
 #include <ROOT/RDataFrame.hxx>
@@ -75,12 +76,12 @@ namespace FCCAnalyses {
       std::vector<std::vector<const podio::CollectionBase*>> m_Collections;
       /// Active collections
       std::vector<unsigned int> m_activeCollections;
-      /// Root legacy podio reader
-      std::map<int, podio::ROOTLegacyReader> m_podioReaders;
+      /// Root legacy podio readers
+      std::vector<std::unique_ptr<podio::ROOTLegacyReader>> m_podioReaders;
       /// Podio frames
-      std::map<int, podio::Frame> m_frames;
-      /// Mutex to protect frame map
-      mutable std::shared_mutex m_frames_mutex;
+      std::vector<std::unique_ptr<podio::Frame>> m_frames;
+      /// Mutex to protect frame
+      std::mutex m_frames_mutex;
       /// Setup input
       void SetupInput(int nEvents);
   };

e4hsource/include/EDM4hepSource/EDM4hepSource.hxx

@@ -2,7 +2,7 @@
 #define EDM4HEP_SOURCE_H__
 
 // STL
-#include <podio/ROOTLegacyReader.h>
+#include <memory>
 #include <vector>
 #include <string>
 #include <functional>
@@ -14,7 +14,6 @@
 // Podio
 #include <podio/Frame.h>
 #include <podio/ROOTFrameReader.h>
-#include <podio/ROOTLegacyReader.h>
 #include <podio/CollectionBase.h>
 
 bool loadEDM4hepSource();
@@ -76,26 +75,24 @@ namespace FCCAnalyses {
       std::vector<std::vector<const podio::CollectionBase*>> m_Collections;
       /// Active collections
       std::vector<unsigned int> m_activeCollections;
-      /// Root podio reader
-      std::map<int, podio::ROOTFrameReader> m_podioReaders;
-      /// Legacy Root podio reader
-      std::map<int, podio::ROOTLegacyReader> m_podioLegacyReaders;
+      /// Root podio readers
+      std::vector<std::unique_ptr<podio::ROOTFrameReader>> m_podioReaders;
       /// Podio frames
-      std::map<int, podio::Frame> m_frames;
-      /// Legacy Podio reader
-      bool m_useLegacyReaders;
+      std::vector<std::unique_ptr<podio::Frame>> m_frames;
       /// Setup input
       void SetupInput(int nEvents);
   };
 
 
   /**
-   * \brief Retrieve from EDM4hepSource per-thread readers for the desired columns.
+   * \brief Retrieve from EDM4hepSource per-thread readers for the
+   *        desired columns.
    */
   template<typename T>
   std::vector<T**>
   EDM4hepSource::GetColumnReaders(std::string_view columnName) {
-    std::cout << "EDM4hepSource: Getting column readers for column: " << columnName << std::endl;
+    std::cout << "EDM4hepSource: Getting column readers for column: "
+              << columnName << std::endl;
 
     std::vector<T**> readers;