Move HGCalRawDataDefinitions.h.

cms-sw · Jul 24, 2024 · 2a083a9 · 2a083a9
1 parent e109222
commit 2a083a9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/...Algos/interface/HGCalRawDataDefinitions.h → ...lDigi/interface/HGCalRawDataDefinitions.h b/...Algos/interface/HGCalRawDataDefinitions.h → ...lDigi/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
@@ -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<uint32_t> buildCaptureBlockHeader(uint32_t bunch_crossing,

diff --git a/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h b/SimCalorimetry/HGCalSimAlgos/interface/SlinkTypes.h
@@ -6,7 +6,7 @@
 #include <tuple>
 #include <vector>
 
-#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
@@ -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
@@ -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
@@ -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;