EventLoaderEUDAQ2: read tags from undecoded raw event

src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.cpp

@@ -159,13 +159,17 @@ std::shared_ptr<eudaq::StandardEvent> EventLoaderEUDAQ2::get_next_event() {
         }
         auto event = events_.front();
         events_.erase(events_.begin());
+
+        // Read and store tag information:
+        retrieve_event_tags(event);
+
         decoding_failed = !eudaq::StdEventConverter::Convert(event, stdevt, eudaq_config_);
         LOG(DEBUG) << event->GetDescription() << ": EventConverter returned " << (decoding_failed ? "false" : "true");
     } while(decoding_failed);
     return stdevt;
 }
 
-void EventLoaderEUDAQ2::retrieve_event_tags(const std::shared_ptr<eudaq::StandardEvent> evt) {
+void EventLoaderEUDAQ2::retrieve_event_tags(const eudaq::EventSPC evt) {
     auto tags = evt->GetTags();
 
     for(auto tag_pair : tags) {
@@ -345,9 +349,6 @@ StatusCode EventLoaderEUDAQ2::run(std::shared_ptr<Clipboard> clipboard) {
             }
         }
 
-        // Read and store tag information:
-        retrieve_event_tags(event_);
-
         // Check if this event is within the currently defined Corryvreckan event:
         current_position = is_within_event(clipboard, event_);
 

src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.h

@@ -79,7 +79,7 @@ namespace corryvreckan {
          * @brief Helper function to retrieve event tags and creating plots from them
          * @param evt Shared pointer to the current event
          */
-        void retrieve_event_tags(const std::shared_ptr<eudaq::StandardEvent> evt);
+        void retrieve_event_tags(const eudaq::EventSPC evt);
 
         /**
          * @brief Store pixel data from relevant detectors on the clipboard