Merge 431dc1a into sapling-pr-archive-ktf

Author: ktf

Detectors/TRD/workflow/src/TRDDigitizerSpec.cxx

@@ -32,6 +32,7 @@
 #include "TRDSimulation/Digitizer.h"
 #include "TRDSimulation/Detector.h" // for the Hit type
 #include "TRDSimulation/TRDSimParams.h"
+#include "DetectorsRaw/HBFUtils.h"
 #include <chrono>
 
 using namespace o2::framework;
@@ -92,6 +93,8 @@ class TRDDPLDigitizerTask : public o2::base::BaseDPLDigitizer
     size_t currTrig = 0;                    // from which collision is the current TRD trigger (only needed for debug information)
     bool firstEvent = true;                 // Flag for the first event processed
 
+    auto firstTF = InteractionTimeRecord(o2::raw::HBFUtils::Instance().getFirstSampledTFIR(), 0);
+
     TStopwatch timer;
     timer.Start();
     // loop over all composite collisions given from context
@@ -100,6 +103,16 @@ class TRDDPLDigitizerTask : public o2::base::BaseDPLDigitizer
       LOGF(debug, "Collision %lu out of %lu at %.1f ns started processing. Current pileup container size: %lu. Current number of digits accumulated: %lu",
            collID, irecords.size(), irecords[collID].getTimeNS(), mDigitizer.getPileupSignals().size(), digitsAccum.size());
       currentTime = irecords[collID];
+
+      // Note: Very crude filter to neglect collisions coming before
+      // the first interaction record of the timeframe. Remove this, once these collisions can be handled
+      // within the digitization routine. Collisions before this timeframe might impact digits of this timeframe.
+      // See https://its.cern.ch/jira/browse/O2-5395.
+      if (currentTime < firstTF) {
+        LOG(info) << "Too early: Not digitizing collision " << collID;
+        continue;
+      }
+
       // Trigger logic implemented here
       bool isNewTrigger = true; // flag newly accepted readout trigger
       if (firstEvent) {

Framework/Core/include/Framework/DataAllocator.h

@@ -140,8 +140,8 @@ class DataAllocator
   using DataDescription = o2::header::DataDescription;
   using SubSpecificationType = o2::header::DataHeader::SubSpecificationType;
   template <typename T>
+    requires std::is_fundamental_v<T>
   struct UninitializedVector {
-    static_assert(std::is_fundamental<T>::value, "UninitializedVector only allowed for fundamental types");
     using value_type = T;
   };
 

Framework/Core/src/TableTreeHelpers.cxx

@@ -128,54 +128,6 @@ BranchToColumn::BranchToColumn(TBranch* branch, bool VLA, std::string name, EDat
   }
 }
 
-template <typename T>
-inline T doSwap(T)
-{
-  static_assert(always_static_assert_v<T>, "Unsupported type");
-}
-
-template <>
-inline uint16_t doSwap(uint16_t x)
-{
-  return swap16_(x);
-}
-
-template <>
-inline uint32_t doSwap(uint32_t x)
-{
-  return swap32_(x);
-}
-
-template <>
-inline uint64_t doSwap(uint64_t x)
-{
-  return swap64_(x);
-}
-
-template <typename T>
-void doSwapCopy_(void* dest, void* source, int size) noexcept
-{
-  auto tdest = static_cast<T*>(dest);
-  auto tsrc = static_cast<T*>(source);
-  for (auto i = 0; i < size; ++i) {
-    tdest[i] = doSwap<T>(tsrc[i]);
-  }
-}
-
-void swapCopy(unsigned char* dest, char* source, int size, int typeSize) noexcept
-{
-  switch (typeSize) {
-    case 1:
-      return (void)std::memcpy(dest, source, size);
-    case 2:
-      return doSwapCopy_<uint16_t>(dest, source, size);
-    case 4:
-      return doSwapCopy_<uint32_t>(dest, source, size);
-    case 8:
-      return doSwapCopy_<uint64_t>(dest, source, size);
-  }
-}
-
 std::pair<std::shared_ptr<arrow::ChunkedArray>, std::shared_ptr<arrow::Field>> BranchToColumn::read(TBuffer* buffer)
 {
   auto totalEntries = mBranch->GetEntries();

Framework/Foundation/include/Framework/Endian.h

@@ -12,6 +12,9 @@
 #ifndef O2_FRAMEWORK_ENDIAN_H_
 #define O2_FRAMEWORK_ENDIAN_H_
 
+#include <cstdint>
+#include <concepts>
+#include <cstring>
 // Lookup file for __BYTE_ORDER
 #ifdef __APPLE__
 #include <machine/endian.h>
@@ -29,4 +32,50 @@
 #define O2_HOST_BYTE_ORDER __BYTE_ORDER
 #define O2_BIG_ENDIAN __BIG_ENDIAN
 #define O2_LITTLE_ENDIAN __LITTLE_ENDIAN
+
+
+template <typename T>
+  requires std::same_as<T, uint16_t>
+inline uint16_t doSwap(uint16_t x)
+{
+  return swap16_(x);
+}
+
+template <typename T>
+  requires std::same_as<T, uint32_t>
+inline uint32_t doSwap(uint32_t x)
+{
+  return swap32_(x);
+}
+
+template <typename T>
+  requires std::same_as<T, uint64_t>
+inline uint64_t doSwap(uint64_t x)
+{
+  return swap64_(x);
+}
+
+template <typename T>
+inline void doSwapCopy_(void* dest, void* source, int size) noexcept
+{
+  auto tdest = static_cast<T*>(dest);
+  auto tsrc = static_cast<T*>(source);
+  for (auto i = 0; i < size; ++i) {
+    tdest[i] = doSwap<T>(tsrc[i]);
+  }
+}
+
+inline void swapCopy(unsigned char* dest, char* source, int size, int typeSize) noexcept
+{
+  switch (typeSize) {
+    case 1:
+      return (void)std::memcpy(dest, source, size);
+    case 2:
+      return doSwapCopy_<uint16_t>(dest, source, size);
+    case 4:
+      return doSwapCopy_<uint32_t>(dest, source, size);
+    case 8:
+      return doSwapCopy_<uint64_t>(dest, source, size);
+  }
+}
 #endif // O2_FRAMEWORK_ENDIAN_H_

Steer/DigitizerWorkflow/CMakeLists.txt

@@ -51,6 +51,7 @@ o2_add_executable(digitizer-workflow
                                         O2::MCHDigitFiltering
                                         O2::MFTSimulation
                                         O2::MIDSimulation
+                                        O2::MIDRaw
                                         O2::PHOSSimulation
                                         O2::CPVSimulation
                                         O2::TOFSimulation

Steer/DigitizerWorkflow/src/MIDDigitizerSpec.cxx

@@ -20,6 +20,7 @@
 #include "Framework/Task.h"
 #include "Steer/HitProcessingManager.h" // for DigitizationContext
 #include "DetectorsBase/BaseDPLDigitizer.h"
+#include "DetectorsRaw/HBFUtils.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsMID/ROFRecord.h"
@@ -30,6 +31,7 @@
 #include "MIDSimulation/ChamberResponse.h"
 #include "MIDSimulation/ChamberEfficiencyResponse.h"
 #include "MIDSimulation/Geometry.h"
+#include "MIDRaw/ElectronicsDelay.h"
 #include "DataFormatsMID/MCLabel.h"
 
 using namespace o2::framework;
@@ -83,6 +85,10 @@ class MIDDPLDigitizerTask : public o2::base::BaseDPLDigitizer
     context->initSimChains(o2::detectors::DetID::MID, mSimChains);
     auto& irecords = context->getEventRecords();
 
+    auto firstTF = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();
+    auto delay = InteractionRecord(mElectronicsDelay.localToBC, 0);
+    auto firstTimeTF = InteractionTimeRecord(firstTF + delay, 0);
+
     auto& eventParts = context->getEventParts();
     std::vector<o2::mid::ColumnData> digits, digitsAccum;
     std::vector<o2::mid::ROFRecord> rofRecords;
@@ -93,6 +99,11 @@ class MIDDPLDigitizerTask : public o2::base::BaseDPLDigitizer
     for (int collID = 0; collID < irecords.size(); ++collID) {
       // for each collision, loop over the constituents event and source IDs
       // (background signal merging is basically taking place here)
+
+      // Skip digits produced before the first orbit
+      if (irecords[collID] < firstTimeTF) {
+        continue;
+      }
       auto firstEntry = digitsAccum.size();
       for (auto& part : eventParts[collID]) {
         mDigitizer->setEventID(part.entryID);
@@ -136,6 +147,7 @@ class MIDDPLDigitizerTask : public o2::base::BaseDPLDigitizer
   std::vector<TChain*> mSimChains;
   // RS: at the moment using hardcoded flag for continuos readout
   o2::parameters::GRPObject::ROMode mROMode = o2::parameters::GRPObject::CONTINUOUS; // readout mode
+  ElectronicsDelay mElectronicsDelay;                                                // Electronics delay
 };
 
 o2::framework::DataProcessorSpec getMIDDigitizerSpec(int channel, bool mctruth)