Skip to content

Commit 4959b11

Browse files
committed
Revert "Add ever-incrementing TF counter to DataHeader"
This reverts commit 009ee46.
1 parent 489c3a0 commit 4959b11

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

DataFormats/Headers/include/Headers/DataHeader.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,9 @@ struct DataHeader : public BaseHeader {
666666
using SplitPayloadPartsType = uint32_t;
667667
using PayloadSizeType = uint64_t;
668668
using TForbitType = uint32_t;
669-
using TFCounterType = uint32_t;
670669

671670
//static data for this header type/version
672-
static constexpr uint32_t sVersion{3};
671+
static constexpr uint32_t sVersion{2};
673672
static constexpr o2::header::HeaderType sHeaderType{String2<uint64_t>("DataHead")};
674673
static constexpr o2::header::SerializationMethod sSerializationMethod{gSerializationMethodNone};
675674

@@ -712,15 +711,10 @@ struct DataHeader : public BaseHeader {
712711
//___NEW STUFF GOES BELOW
713712

714713
///
715-
/// first orbit of time frame as unique identifier within the run (unless the TF is replayed), since v2
714+
/// first orbit of time frame as unique identifier within the run
716715
///
717716
TForbitType firstTForbit;
718717

719-
///
720-
/// ever incrementing TF counter, allows to disentangle even TFs with same firstTForbit in case of replay, since v3
721-
///
722-
TFCounterType tfCounter;
723-
724718
//___the functions:
725719
//__________________________________________________________________________________________________
726720
constexpr DataHeader()
@@ -732,8 +726,7 @@ struct DataHeader : public BaseHeader {
732726
subSpecification(0),
733727
splitPayloadIndex(0),
734728
payloadSize(0),
735-
firstTForbit{0},
736-
tfCounter(0)
729+
firstTForbit{0}
737730
{
738731
}
739732

@@ -747,8 +740,7 @@ struct DataHeader : public BaseHeader {
747740
subSpecification(subspec),
748741
splitPayloadIndex(0),
749742
payloadSize(size),
750-
firstTForbit{0},
751-
tfCounter(0)
743+
firstTForbit{0}
752744
{
753745
}
754746

@@ -762,8 +754,7 @@ struct DataHeader : public BaseHeader {
762754
subSpecification(subspec),
763755
splitPayloadIndex(partIndex),
764756
payloadSize(size),
765-
firstTForbit{0},
766-
tfCounter(0)
757+
firstTForbit{0}
767758
{
768759
}
769760

0 commit comments

Comments
 (0)