FIT: Renamed EEventDataBit to ChannelDataBit

wpierozak · wpierozak · commit da3e85816327 · 2025-09-24T11:51:13.000+02:00
diff --git a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h
@@ -21,7 +21,7 @@
 #include "DataFormatsFDD/ChannelData.h"
 #include "CommonDataFormat/RangeReference.h"
 #include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFIT/EEventDataBit.h"
+#include "DataFormatsFIT/ChannelDataBit.h"
 
 namespace o2
 {
@@ -47,35 +47,35 @@ struct ChannelDataFloat {
     adcId = AdcId;
   }
 
-  static void setFlag(fit::EEventDataBit bitFlag, int& adcId)
+  static void setFlag(fit::ChannelDataBit bitFlag, int& adcId)
   {
     adcId = uint8_t(adcId) | 1u << uint8_t(bitFlag);
   }
-  static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)
+  static void clearFlag(fit::ChannelDataBit bitFlag, int& adcId)
   {
     adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     adcId = flag;
   }
-  void setFlag(fit::EEventDataBit bitFlag, bool value)
+  void setFlag(fit::ChannelDataBit bitFlag, bool value)
   {
     adcId = uint8_t(adcId) | uint8_t(value) << uint8_t(bitFlag);
   }
-  [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
+  [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const
   {
     return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
   }
   [[nodiscard]] bool areAllFlagsGood() const
   {
-    return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&
-            getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&
-            !getFlag(fit::EEventDataBit::kIsAmpHigh) &&
-            getFlag(fit::EEventDataBit::kIsEventInTVDC) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLost));
+    return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&
+            getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&
+            !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&
+            getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));
   }
 
   void print() const;
diff --git a/DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h b/DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h
@@ -20,7 +20,7 @@
 #include "DataFormatsFT0/ChannelData.h"
 #include "CommonDataFormat/RangeReference.h"
 #include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFIT/EEventDataBit.h"
+#include "DataFormatsFIT/ChannelDataBit.h"
 #include <array>
 #include "Rtypes.h"
 #include <TObject.h>
@@ -53,35 +53,35 @@ struct ChannelDataFloat {
     ChainQTC = chainQTC;
   }
 
-  static void setFlag(fit::EEventDataBit bitFlag, int& chainQTC)
+  static void setFlag(fit::ChannelDataBit bitFlag, int& chainQTC)
   {
     chainQTC = uint8_t(chainQTC) | 1u << uint8_t(bitFlag);
   }
-  static void clearFlag(fit::EEventDataBit bitFlag, int& chainQTC)
+  static void clearFlag(fit::ChannelDataBit bitFlag, int& chainQTC)
   {
     chainQTC = uint8_t(chainQTC) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     ChainQTC = flag;
   }
-  void setFlag(fit::EEventDataBit bitFlag, bool value)
+  void setFlag(fit::ChannelDataBit bitFlag, bool value)
   {
     ChainQTC = uint8_t(ChainQTC) | uint8_t(value) << uint8_t(bitFlag);
   }
-  [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
+  [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const
   {
     return bool(uint8_t(ChainQTC) & (1u << uint8_t(bitFlag)));
   }
   [[nodiscard]] bool areAllFlagsGood() const
   {
-    return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&
-            getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&
-            !getFlag(fit::EEventDataBit::kIsAmpHigh) &&
-            getFlag(fit::EEventDataBit::kIsEventInTVDC) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLost));
+    return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&
+            getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&
+            !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&
+            getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));
   }
 
   void print() const;
diff --git a/DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RecPoints.h b/DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RecPoints.h
@@ -18,7 +18,7 @@
 #include "CommonDataFormat/InteractionRecord.h"
 #include "CommonDataFormat/RangeReference.h"
 #include "DataFormatsFV0/Digit.h"
-#include "DataFormatsFIT/EEventDataBit.h"
+#include "DataFormatsFIT/ChannelDataBit.h"
 #include <array>
 #include <gsl/span>
 
@@ -46,31 +46,31 @@ struct ChannelDataFloat {
     adcId = AdcId;
   }
 
-  static void setFlag(fit::EEventDataBit bitFlag, int& adcId)
+  static void setFlag(fit::ChannelDataBit bitFlag, int& adcId)
   {
     adcId = uint8_t(adcId) | 1u << uint8_t(bitFlag);
   }
-  static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)
+  static void clearFlag(fit::ChannelDataBit bitFlag, int& adcId)
   {
     adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     adcId = flag;
   }
-  [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
+  [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const
   {
     return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
   }
   [[nodiscard]] bool areAllFlagsGood() const
   {
-    return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&
-            getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&
-            !getFlag(fit::EEventDataBit::kIsAmpHigh) &&
-            getFlag(fit::EEventDataBit::kIsEventInTVDC) &&
-            !getFlag(fit::EEventDataBit::kIsTimeInfoLost));
+    return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&
+            getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&
+            !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&
+            getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&
+            !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));
   }
 
   void print() const;
diff --git a/DataFormats/Detectors/FIT/common/include/DataFormatsFIT/ChannelDataBit.h b/DataFormats/Detectors/FIT/common/include/DataFormatsFIT/ChannelDataBit.h
@@ -20,7 +20,7 @@ namespace o2
 {
 namespace fit
 {
-enum class EEventDataBit { kNumberADC = 0,
+enum class ChannelDataBit { kNumberADC = 0,
                            kIsDoubleEvent,
                            kIsTimeInfoNOTvalid,
                            kIsCFDinADCgate,

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include "DataFormatsFDD/ChannelData.h"`
`22`	`22`	`#include "CommonDataFormat/RangeReference.h"`
`23`	`23`	`#include "DataFormatsFDD/Digit.h"`
`24`		`-#include "DataFormatsFIT/EEventDataBit.h"`
	`24`	`+#include "DataFormatsFIT/ChannelDataBit.h"`
`25`	`25`
`26`	`26`	`namespace o2`
`27`	`27`	`{`
`@@ -47,35 +47,35 @@ struct ChannelDataFloat {`
`47`	`47`	`adcId = AdcId;`
`48`	`48`	`}`
`49`	`49`
`50`		`- static void setFlag(fit::EEventDataBit bitFlag, int& adcId)`
	`50`	`+ static void setFlag(fit::ChannelDataBit bitFlag, int& adcId)`
`51`	`51`	`{`
`52`	`52`	`adcId = uint8_t(adcId) \| 1u << uint8_t(bitFlag);`
`53`	`53`	`}`
`54`		`- static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)`
	`54`	`+ static void clearFlag(fit::ChannelDataBit bitFlag, int& adcId)`
`55`	`55`	`{`
`56`	`56`	`adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));`
`57`	`57`	`}`
`58`	`58`	`void setFlag(int flag)`
`59`	`59`	`{`
`60`	`60`	`adcId = flag;`
`61`	`61`	`}`
`62`		`- void setFlag(fit::EEventDataBit bitFlag, bool value)`
	`62`	`+ void setFlag(fit::ChannelDataBit bitFlag, bool value)`
`63`	`63`	`{`
`64`	`64`	`adcId = uint8_t(adcId) \| uint8_t(value) << uint8_t(bitFlag);`
`65`	`65`	`}`
`66`		`- [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const`
	`66`	`+ [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const`
`67`	`67`	`{`
`68`	`68`	`return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));`
`69`	`69`	`}`
`70`	`70`	`[[nodiscard]] bool areAllFlagsGood() const`
`71`	`71`	`{`
`72`		`- return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&`
`73`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&`
`74`		`- getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&`
`75`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&`
`76`		`- !getFlag(fit::EEventDataBit::kIsAmpHigh) &&`
`77`		`- getFlag(fit::EEventDataBit::kIsEventInTVDC) &&`
`78`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLost));`
	`72`	`+ return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&`
	`73`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&`
	`74`	`+ getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&`
	`75`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&`
	`76`	`+ !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&`
	`77`	`+ getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&`
	`78`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`void print() const;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "DataFormatsFT0/ChannelData.h"`
`21`	`21`	`#include "CommonDataFormat/RangeReference.h"`
`22`	`22`	`#include "DataFormatsFT0/Digit.h"`
`23`		`-#include "DataFormatsFIT/EEventDataBit.h"`
	`23`	`+#include "DataFormatsFIT/ChannelDataBit.h"`
`24`	`24`	`#include <array>`
`25`	`25`	`#include "Rtypes.h"`
`26`	`26`	`#include <TObject.h>`
`@@ -53,35 +53,35 @@ struct ChannelDataFloat {`
`53`	`53`	`ChainQTC = chainQTC;`
`54`	`54`	`}`
`55`	`55`
`56`		`- static void setFlag(fit::EEventDataBit bitFlag, int& chainQTC)`
	`56`	`+ static void setFlag(fit::ChannelDataBit bitFlag, int& chainQTC)`
`57`	`57`	`{`
`58`	`58`	`chainQTC = uint8_t(chainQTC) \| 1u << uint8_t(bitFlag);`
`59`	`59`	`}`
`60`		`- static void clearFlag(fit::EEventDataBit bitFlag, int& chainQTC)`
	`60`	`+ static void clearFlag(fit::ChannelDataBit bitFlag, int& chainQTC)`
`61`	`61`	`{`
`62`	`62`	`chainQTC = uint8_t(chainQTC) & ~(1u << uint8_t(bitFlag));`
`63`	`63`	`}`
`64`	`64`	`void setFlag(int flag)`
`65`	`65`	`{`
`66`	`66`	`ChainQTC = flag;`
`67`	`67`	`}`
`68`		`- void setFlag(fit::EEventDataBit bitFlag, bool value)`
	`68`	`+ void setFlag(fit::ChannelDataBit bitFlag, bool value)`
`69`	`69`	`{`
`70`	`70`	`ChainQTC = uint8_t(ChainQTC) \| uint8_t(value) << uint8_t(bitFlag);`
`71`	`71`	`}`
`72`		`- [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const`
	`72`	`+ [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const`
`73`	`73`	`{`
`74`	`74`	`return bool(uint8_t(ChainQTC) & (1u << uint8_t(bitFlag)));`
`75`	`75`	`}`
`76`	`76`	`[[nodiscard]] bool areAllFlagsGood() const`
`77`	`77`	`{`
`78`		`- return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&`
`79`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&`
`80`		`- getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&`
`81`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&`
`82`		`- !getFlag(fit::EEventDataBit::kIsAmpHigh) &&`
`83`		`- getFlag(fit::EEventDataBit::kIsEventInTVDC) &&`
`84`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLost));`
	`78`	`+ return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&`
	`79`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&`
	`80`	`+ getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&`
	`81`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&`
	`82`	`+ !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&`
	`83`	`+ getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&`
	`84`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`void print() const;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#include "CommonDataFormat/InteractionRecord.h"`
`19`	`19`	`#include "CommonDataFormat/RangeReference.h"`
`20`	`20`	`#include "DataFormatsFV0/Digit.h"`
`21`		`-#include "DataFormatsFIT/EEventDataBit.h"`
	`21`	`+#include "DataFormatsFIT/ChannelDataBit.h"`
`22`	`22`	`#include <array>`
`23`	`23`	`#include <gsl/span>`
`24`	`24`
`@@ -46,31 +46,31 @@ struct ChannelDataFloat {`
`46`	`46`	`adcId = AdcId;`
`47`	`47`	`}`
`48`	`48`
`49`		`- static void setFlag(fit::EEventDataBit bitFlag, int& adcId)`
	`49`	`+ static void setFlag(fit::ChannelDataBit bitFlag, int& adcId)`
`50`	`50`	`{`
`51`	`51`	`adcId = uint8_t(adcId) \| 1u << uint8_t(bitFlag);`
`52`	`52`	`}`
`53`		`- static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)`
	`53`	`+ static void clearFlag(fit::ChannelDataBit bitFlag, int& adcId)`
`54`	`54`	`{`
`55`	`55`	`adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));`
`56`	`56`	`}`
`57`	`57`	`void setFlag(int flag)`
`58`	`58`	`{`
`59`	`59`	`adcId = flag;`
`60`	`60`	`}`
`61`		`- [[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const`
	`61`	`+ [[nodiscard]] bool getFlag(fit::ChannelDataBit bitFlag) const`
`62`	`62`	`{`
`63`	`63`	`return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));`
`64`	`64`	`}`
`65`	`65`	`[[nodiscard]] bool areAllFlagsGood() const`
`66`	`66`	`{`
`67`		`- return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&`
`68`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&`
`69`		`- getFlag(fit::EEventDataBit::kIsCFDinADCgate) &&`
`70`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLate) &&`
`71`		`- !getFlag(fit::EEventDataBit::kIsAmpHigh) &&`
`72`		`- getFlag(fit::EEventDataBit::kIsEventInTVDC) &&`
`73`		`- !getFlag(fit::EEventDataBit::kIsTimeInfoLost));`
	`67`	`+ return (!getFlag(fit::ChannelDataBit::kIsDoubleEvent) &&`
	`68`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoNOTvalid) &&`
	`69`	`+ getFlag(fit::ChannelDataBit::kIsCFDinADCgate) &&`
	`70`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLate) &&`
	`71`	`+ !getFlag(fit::ChannelDataBit::kIsAmpHigh) &&`
	`72`	`+ getFlag(fit::ChannelDataBit::kIsEventInTVDC) &&`
	`73`	`+ !getFlag(fit::ChannelDataBit::kIsTimeInfoLost));`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`void print() const;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace o2`
`20`	`20`	`{`
`21`	`21`	`namespace fit`
`22`	`22`	`{`
`23`		`-enum class EEventDataBit { kNumberADC = 0,`
	`23`	`+enum class ChannelDataBit { kNumberADC = 0,`
`24`	`24`	`kIsDoubleEvent,`
`25`	`25`	`kIsTimeInfoNOTvalid,`
`26`	`26`	`kIsCFDinADCgate,`