diff --git a/Event/LumiEvent/include/Event/LumiSummaryOffsets_V0.h b/Event/LumiEvent/include/Event/LumiSummaryOffsets_V0.h
deleted file mode 100644
index 8f6558067717d9b4fa06b03e0b993cb77d7e29d2..0000000000000000000000000000000000000000
--- a/Event/LumiEvent/include/Event/LumiSummaryOffsets_V0.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************\
-* (c) Copyright 2022 CERN for the benefit of the LHCb Collaboration *
-* *
-* This software is distributed under the terms of the Apache License *
-* version 2 (Apache-2.0), copied verbatim in the file "COPYING". *
-* *
-* In applying this licence, CERN does not waive the privileges and immunities *
-* granted to it by virtue of its status as an Intergovernmental Organization *
-* or submit itself to any jurisdiction. *
-\*****************************************************************************/
-#pragma once
-
-#include <iostream>
-
-namespace LHCb {
- namespace LumiSummaryOffsets {
- namespace V0 {
- enum counterOffsets : unsigned {
- // All values are in bits - the required size of the array may be determined
- // by dividing the largest offset by 8*sizeof(unsigned), i.e. 32, and rounding up.
- // Fields must be contained within a single element of the array, e.g. an
- // offset of 24 would allow for a maximum size of 8.
- /// ODIN info
- ODINStart = 0,
- t0LowSize = 32,
- t0LowOffset = ODINStart + 0, // event time offset low 32 bits
- t0HighSize = 32,
- t0HighOffset = ODINStart + t0LowSize, // event time offset high 32 bits
- bcidLowSize = 32,
- bcidLowOffset = ODINStart + t0LowSize + t0HighSize, // re-mapped bcid low 32 bits
- bcidHighSize = 14,
- bcidHighOffset = ODINStart + t0LowSize + t0HighSize + bcidLowSize, // re-mapped bcid high 14 bits
- bxTypeSize = 2,
- bxTypeOffset = ODINStart + t0LowSize + t0HighSize + bcidLowSize + bcidHighSize, // bunch crossing type
- ODINEnd = ODINStart + t0LowSize + t0HighSize + bcidLowSize + bcidHighSize + bxTypeSize,
- /// Global Event Cut
- GecStart = ODINEnd,
- GecSize = 1,
- GecOffset = GecStart,
- GecEnd = GecStart + GecSize,
- /// Velo counters
- VeloCountersStart = GecEnd,
- VeloTracksSize = 15,
- VeloTracksOffset = VeloCountersStart + 0, // number of Velo tracks
- VeloVerticesSize = 6,
- VeloVerticesOffset = VeloCountersStart + VeloTracksSize, // number of Velo vertices
- VeloCountersEnd = VeloCountersStart + VeloTracksSize + VeloVerticesSize,
- /// RICH counters
- RichCountersStart = VeloCountersEnd,
- RichCountersEnd = RichCountersStart + 0,
- /// SciFi counters
- SciFiCountersStart = RichCountersEnd,
- SciFiClustersSize = 15,
- SciFiClustersOffset = SciFiCountersStart + 0, // number of SciFi Clusters
- SciFiCountersEnd = SciFiCountersStart + SciFiClustersSize,
- /// CALO counters
- CaloCountersStart = SciFiCountersEnd,
- CaloCountersEnd = CaloCountersStart + 0,
- /// Muon counters
- MuonCountersStart = CaloCountersEnd,
- M2R2Size = 11,
- M2R2Offset = MuonCountersStart, // M2R2 hits
- M2R3Size = 11,
- M2R3Offset = MuonCountersStart + M2R2Size, // M2R3 hits
- M3R2Size = 11,
- M3R2Offset = MuonCountersStart + M2R2Size + M2R3Size, // M3R2 hits
- M3R3Size = 10,
- M3R3Offset = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size, // M3R3 hits
- MuonCountersEnd = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size + M3R3Size,
- /// the largest offset rounded up to the next multiple of 32
- TotalSize = ( ( MuonCountersEnd - 1 ) / 32 + 1 ) * 32
- }; // enum CounterOffsets
- } // namespace V0
- } // namespace LumiSummaryOffsets
-} // namespace LHCb
diff --git a/Event/LumiEvent/include/Event/LumiSummaryOffsets_V1.h b/Event/LumiEvent/include/Event/LumiSummaryOffsets_V1.h
index 58e6d0215dea5fb98da2bed50e96ff7d9b626bc6..2460df4132249a04653fffed03309584aa924cad 100644
--- a/Event/LumiEvent/include/Event/LumiSummaryOffsets_V1.h
+++ b/Event/LumiEvent/include/Event/LumiSummaryOffsets_V1.h
@@ -49,74 +49,24 @@ namespace LHCb {
RichCountersStart = VeloCountersEnd,
RichCountersEnd = RichCountersStart + 0,
/// SciFi counters
- SciFiCountersStart = RichCountersEnd,
- SciFiM45S1Size = 13,
- SciFiM45S1Offset = SciFiCountersStart + 0, // SciFi Clusters in M45S1
- SciFiM45S2Size = 13,
- SciFiM45S2Offset = SciFiCountersStart + SciFiM45S1Size, // SciFi Clusters in M45S2
- SciFiM45S3Size = 16,
- SciFiM45S3Offset = SciFiCountersStart + SciFiM45S1Size + SciFiM45S2Size, // SciFi Clusters in M45S3
- SciFiClustersSize = 16,
- SciFiClustersOffset =
- SciFiCountersStart + SciFiM45S1Size + SciFiM45S2Size + SciFiM45S3Size, // SciFi Clusters in M123S1
- SciFiM123S2Size = 16,
- SciFiM123S2Offset = SciFiCountersStart + SciFiM45S1Size + SciFiM45S2Size + SciFiM45S3Size +
- SciFiClustersSize, // SciFi Clusters in M123S2
- SciFiM123S3Size = 16,
- SciFiM123S3Offset = SciFiCountersStart + SciFiM45S1Size + SciFiM45S2Size + SciFiM45S3Size + SciFiClustersSize +
- SciFiM123S2Size, // SciFi Clusters in M123S3
- SciFiCountersEnd = SciFiCountersStart + SciFiM45S1Size + SciFiM45S2Size + SciFiM45S3Size + SciFiClustersSize +
- SciFiM123S2Size + SciFiM123S3Size,
+ SciFiCountersStart = RichCountersEnd,
+ SciFiClustersSize = 15,
+ SciFiClustersOffset = SciFiCountersStart + 0, // number of SciFi Clusters
+ SciFiCountersEnd = SciFiCountersStart + SciFiClustersSize,
/// CALO counters
CaloCountersStart = SciFiCountersEnd,
- ECalETSize = 16,
- ECalETOffset = CaloCountersStart, // ECal ET
- // Inner layer
- ECalEITSize = 16,
- ECalEITOffset = CaloCountersStart + ECalETSize, // ECal E_tot in inner top
- ECalEIBSize = 16,
- ECalEIBOffset = CaloCountersStart + ECalETSize + ECalEITSize, // ECal E_tot in inner bottom
- // Middle layer
- ECalEMTSize = 16,
- ECalEMTOffset = ECalEIBOffset + ECalEIBSize, // ECal E_tot in middle top
- ECalEMBSize = 16,
- ECalEMBOffset = ECalEIBOffset + ECalEIBSize + ECalEMTSize, // ECal E_tot in middle bottom
- // Outer layer
- ECalEOTSize = 16,
- ECalEOTOffset = ECalEMBOffset + ECalEMBSize, // ECal E_tot in outer top
- ECalEOBSize = 16,
- ECalEOBOffset = ECalEMBOffset + ECalEMBSize + ECalEOTSize, // ECal E_tot in outer bottom
- CaloCountersEnd = ECalEMBOffset + ECalEMBSize + ECalEOTSize + ECalEOBSize,
+ CaloCountersEnd = CaloCountersStart + 0,
/// Muon counters
MuonCountersStart = CaloCountersEnd,
- // M2
- M2R1Size = 16,
- M2R1Offset = MuonCountersStart, // M2R1 hits
- M2R2Size = 16,
- M2R2Offset = MuonCountersStart + M2R1Size, // M2R2 hits
- M2R3Size = 16,
- M2R3Offset = MuonCountersStart + M2R1Size + M2R2Size, // M2R3 hits
- M2R4Size = 11,
- M2R4Offset = MuonCountersStart + M2R1Size + M2R2Size + M2R3Size, // M2R4 hits
- // M3
- M3R1Size = 11,
- M3R1Offset = M2R4Offset + M2R4Size, // M3R1 hits
- M3R2Size = 10,
- M3R2Offset = M2R4Offset + M2R4Size + M3R1Size, // M3R2 hits
- M3R3Size = 11,
- M3R3Offset = M2R4Offset + M2R4Size + M3R1Size + M3R2Size, // M3R3 hits
- M3R4Size = 11,
- M3R4Offset = M2R4Offset + M2R4Size + M3R1Size + M3R2Size + M3R3Size, // M3R4 hits
- // M4
- M4R1Size = 10,
- M4R1Offset = M3R4Offset + M3R4Size, // M4R1 hits
- M4R2Size = 11,
- M4R2Offset = M3R4Offset + M3R4Size + M4R1Size, // M4R2 hits
- M4R3Size = 11,
- M4R3Offset = M3R4Offset + M3R4Size + M4R1Size + M4R2Size, // M4R3 hits
- M4R4Size = 10,
- M4R4Offset = M3R4Offset + M3R4Size + M4R1Size + M4R2Size + M4R3Size, // M4R4 hits
- MuonCountersEnd = M4R4Offset + M4R4Size,
+ M2R2Size = 11,
+ M2R2Offset = MuonCountersStart, // M2R2 hits
+ M2R3Size = 11,
+ M2R3Offset = MuonCountersStart + M2R2Size, // M2R3 hits
+ M3R2Size = 11,
+ M3R2Offset = MuonCountersStart + M2R2Size + M2R3Size, // M3R2 hits
+ M3R3Size = 10,
+ M3R3Offset = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size, // M3R3 hits
+ MuonCountersEnd = MuonCountersStart + M2R2Size + M2R3Size + M3R2Size + M3R3Size,
/// the largest offset rounded up to the next multiple of 32
TotalSize = ( ( MuonCountersEnd - 1 ) / 32 + 1 ) * 32
}; // enum CounterOffsets