From 2a083a998d0052357a8129d6dbbb28ad8c0e2557 Mon Sep 17 00:00:00 2001 From: Huilin Qu Date: Tue, 16 Apr 2024 15:10:43 +0200 Subject: [PATCH] Move HGCalRawDataDefinitions.h. --- .../interface/HGCalRawDataDefinitions.h | 17 ++++++++++++++++- .../interface/HGCalRawDataPackingTools.h | 10 ---------- .../HGCalSimAlgos/interface/SlinkTypes.h | 2 +- .../src/HGCalECONDEmulatorParameters.cc | 2 +- .../src/HGCalRawDataPackingTools.cc | 2 +- .../HGCalSimAlgos/src/TrivialEmulator.cc | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) rename {SimCalorimetry/HGCalSimAlgos => DataFormats/HGCalDigi}/interface/HGCalRawDataDefinitions.h (88%) diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h b/DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h similarity index 88% rename from SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h rename to DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h index e866cd1f7884f..42fc1e6594f83 100644 --- a/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h +++ b/DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h @@ -4,7 +4,22 @@ namespace hgcal { namespace econd { enum ToTStatus { ZeroSuppressed = 0x0, noZeroSuppressed_TOASuppressed = 0x1, invalid = 0x2, AutomaticFull = 0x3 }; - } + } // namespace econd + + namespace backend { + enum ECONDPacketStatus { + Normal = 0x0, + PayloadTooLarge = 0x1, + PayloadCRCError = 0x2, + EventIDMismatch = 0x3, + EBTimeout = 0x4, + BCIDOrbitIDMismatch = 0x5, + MainBufferOverflow = 0x6, + InactiveECOND = 0x7 + }; + + } // namespace backend + enum ECOND_FRAME { HEADER_POS = 23, HEADER_MASK = 0x1ff, diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataPackingTools.h b/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataPackingTools.h index cde8ea90a79c3..1c231f5cc594d 100644 --- a/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataPackingTools.h +++ b/SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataPackingTools.h @@ -50,16 +50,6 @@ namespace hgcal { } // namespace econd namespace backend { - enum ECONDPacketStatus { - Normal = 0x0, - PayloadCRCError = 0x1, - EventIDMismatch = 0x2, - EBTimeout = 0x4, - BCIDOrbitIDMismatch = 0x5, - MainBufferOverflow = 0x6, - InactiveECOND = 0x7 - }; - /// builds the capture block header (see page 16 of "HGCAL BE DAQ firmware description") /// \return a vector of size 2 with the 2 32b words of the capture block header std::vector buildCaptureBlockHeader(uint32_t bunch_crossing, diff --git a/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h b/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h index fc3b1ffffa794..b7222b1e127ae 100644 --- a/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h +++ b/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h @@ -6,7 +6,7 @@ #include #include -#include "SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h" +#include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h" namespace hgcal::econd { diff --git a/SimCalorimetry/HGCalSimAlgos/src/HGCalECONDEmulatorParameters.cc b/SimCalorimetry/HGCalSimAlgos/src/HGCalECONDEmulatorParameters.cc index d3882a248667a..3a3f300f768cf 100644 --- a/SimCalorimetry/HGCalSimAlgos/src/HGCalECONDEmulatorParameters.cc +++ b/SimCalorimetry/HGCalSimAlgos/src/HGCalECONDEmulatorParameters.cc @@ -1,5 +1,5 @@ #include "SimCalorimetry/HGCalSimAlgos/interface/HGCalECONDEmulatorParameters.h" -#include "SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h" +#include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h" using namespace hgcal::econd; diff --git a/SimCalorimetry/HGCalSimAlgos/src/HGCalRawDataPackingTools.cc b/SimCalorimetry/HGCalSimAlgos/src/HGCalRawDataPackingTools.cc index 9e3c91a63b858..da5cde343f58e 100644 --- a/SimCalorimetry/HGCalSimAlgos/src/HGCalRawDataPackingTools.cc +++ b/SimCalorimetry/HGCalSimAlgos/src/HGCalRawDataPackingTools.cc @@ -1,5 +1,5 @@ #include "SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataPackingTools.h" -#include "SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h" +#include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" diff --git a/SimCalorimetry/HGCalSimAlgos/src/TrivialEmulator.cc b/SimCalorimetry/HGCalSimAlgos/src/TrivialEmulator.cc index 4700e60f8930b..c57296cd396cc 100644 --- a/SimCalorimetry/HGCalSimAlgos/src/TrivialEmulator.cc +++ b/SimCalorimetry/HGCalSimAlgos/src/TrivialEmulator.cc @@ -1,5 +1,5 @@ #include "SimCalorimetry/HGCalSimAlgos/interface/HGCalECONDEmulator.h" -#include "SimCalorimetry/HGCalSimAlgos/interface/HGCalRawDataDefinitions.h" +#include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h" using namespace hgcal::econd;