DPL / TPC: Fix printing 0xDEADBEEF alarm when using RawPageSequencer

Author: davidrohr

Framework/Utils/CMakeLists.txt

@@ -19,7 +19,7 @@ o2_add_library(DPLUtils
                        test/DPLBroadcasterMerger.cxx
                        test/DPLOutputTest.cxx
                        test/RawPageTestData.cxx
-                       PUBLIC_LINK_LIBRARIES O2::Framework ROOT::Tree ROOT::TreePlayer)
+               PUBLIC_LINK_LIBRARIES O2::Framework ROOT::Tree ROOT::TreePlayer O2::CommonUtils)
 
 o2_add_executable(raw-proxy
                   COMPONENT_NAME dpl

Framework/Utils/include/DPLUtils/DPLRawPageSequencer.h

@@ -98,10 +98,16 @@ class DPLRawPageSequencer
     int retVal = 0;
     for (auto const& ref : mInput) {
       auto size = DataRefUtils::getPayloadSize(ref);
+      const auto dh = DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
+      if (dh == nullptr) {
+        continue;
+      }
       if (size == 0) {
+        if (dh->subSpecification == 0xDEADBEEF) {
+          raw_parser::RawParserHelper::warnDeadBeef(dh);
+        }
         continue;
       }
-      const auto dh = DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
       auto const pageSize = rawparser_type::max_size;
       auto nPages = size / pageSize + (size % pageSize ? 1 : 0);
       if (!preCheck(ref.payload, dh->subSpecification)) {

Framework/Utils/include/DPLUtils/RawParser.h

@@ -25,6 +25,10 @@
 #include <stdexcept>
 #include <string>
 #include <type_traits>
+namespace o2::header
+{
+struct DataHeader;
+} // namespace o2::header
 
 // FIXME: probably moved somewhere else
 namespace o2::framework
@@ -87,6 +91,7 @@ struct RawParserHelper {
   static unsigned long sErrorScale; // Exponentionally downscale verbosity.
 
   static bool checkPrintError(size_t& localCounter);
+  static void warnDeadBeef(const o2::header::DataHeader* dh);
 };
 
 /// @class ConcreteRawParser

Framework/Utils/src/RawParser.cxx

@@ -15,6 +15,8 @@
 /// @brief  Generic parser for consecutive raw pages
 
 #include "DPLUtils/RawParser.h"
+#include "CommonUtils/VerbosityConfig.h"
+#include "Headers/DataHeader.h"
 #include "fmt/format.h"
 #include <iostream>
 
@@ -40,6 +42,15 @@ bool RawParserHelper::checkPrintError(size_t& localCounter)
   return sErrors % sErrorScale == 0;
 }
 
+void RawParserHelper::warnDeadBeef(const o2::header::DataHeader* dh)
+{
+  static auto maxWarn = o2::conf::VerbosityConfig::Instance().maxWarnDeadBeef;
+  static int contDeadBeef = 0;
+  if (++contDeadBeef <= maxWarn) {
+    LOGP(alarm, "Found input [{}/{}/0xDEADBEEF] assuming no payload for all links in this TF{}", dh->dataOrigin.as<std::string>(), dh->dataDescription.as<std::string>(), contDeadBeef == maxWarn ? fmt::format(". {} such inputs in row received, stopping reporting", contDeadBeef) : "");
+  }
+}
+
 const char* RDHFormatter<V7>::sFormatString = "{:>5} {:>4} {:>4} {:>4} {:>4} {:>3} {:>3} {:>3}  {:>1} {:>2}";
 void RDHFormatter<V7>::apply(std::ostream& os, V7 const& header, FormatSpec choice, const char* delimiter)
 {

GPU/Workflow/src/GPUWorkflowITS.cxx

@@ -37,8 +37,6 @@
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
 #include "DataFormatsTPC/Digit.h"
 #include "TPCFastTransform.h"
-#include "DPLUtils/DPLRawParser.h"
-#include "DPLUtils/DPLRawPageSequencer.h"
 #include "DetectorsBase/MatLayerCylSet.h"
 #include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"

GPU/Workflow/src/GPUWorkflowSpec.cxx

@@ -70,7 +70,6 @@
 #include "TRDBase/Geometry.h"
 #include "TRDBase/GeometryFlat.h"
 #include "ITSBase/GeometryTGeo.h"
-#include "CommonUtils/VerbosityConfig.h"
 #include "CommonUtils/DebugStreamer.h"
 #include "GPUReconstructionConvert.h"
 #include "DetectorsRaw/RDHUtils.h"
@@ -413,23 +412,13 @@ void GPURecoWorkflowSpec::processInputs(ProcessingContext& pc, A& tpcZSmetaPoint
                                                          (feeLinkID == o2::tpc::rdh_utils::DLBZSLinkID && (rdhLink == o2::tpc::rdh_utils::UserLogicLinkID || rdhLink == o2::tpc::rdh_utils::DLBZSLinkID || rdhLink == 0)));
     };
     auto insertPages = [&tpcZSmetaPointers, &tpcZSmetaSizes, checkForZSData](const char* ptr, size_t count, uint32_t subSpec) -> void {
-      if (subSpec == 0xdeadbeef) {
-        auto maxWarn = o2::conf::VerbosityConfig::Instance().maxWarnDeadBeef;
-        static int contDeadBeef = 0;
-        if (++contDeadBeef <= maxWarn) {
-          LOGP(alarm, "Found input [TPC/RAWDATA/0xdeadbeef] assuming no payload for all links in this TF{}", contDeadBeef == maxWarn ? fmt::format(". {} such inputs in row received, stopping reporting", contDeadBeef) : "");
-        }
-        return;
-      }
       if (checkForZSData(ptr, subSpec)) {
         int rawcru = o2::tpc::rdh_utils::getCRU(ptr);
         int rawendpoint = o2::tpc::rdh_utils::getEndPoint(ptr);
         tpcZSmetaPointers[rawcru / 10][(rawcru % 10) * 2 + rawendpoint].emplace_back(ptr);
         tpcZSmetaSizes[rawcru / 10][(rawcru % 10) * 2 + rawendpoint].emplace_back(count);
       }
     };
-    // the sequencer processes all inputs matching the filter and finds sequences of consecutive
-    // raw pages based on the matcher predicate, and calls the inserter for each sequence
     if (DPLRawPageSequencer(pc.inputs(), filter)(isSameRdh, insertPages, checkForZSData)) {
       debugTFDump = true;
       static unsigned int nErrors = 0;

GPU/Workflow/src/GPUWorkflowTPC.cxx

@@ -37,8 +37,6 @@
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
 #include "DataFormatsTPC/Digit.h"
 #include "TPCFastTransform.h"
-#include "DPLUtils/DPLRawParser.h"
-#include "DPLUtils/DPLRawPageSequencer.h"
 #include "DetectorsBase/MatLayerCylSet.h"
 #include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"