FIT: added explicit type conversion where EEventDataBit is used

wpierozak · wpierozak · commit 39f8c8954d70 · 2025-09-22T08:30:14.000+02:00
diff --git a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h
@@ -49,23 +49,23 @@ struct ChannelDataFloat {
 
   static void setFlag(fit::EEventDataBit bitFlag, int& adcId)
   {
-    adcId = uint8_t(adcId) | 1u << bitFlag;
+    adcId = uint8_t(adcId) | 1u << uint8_t(bitFlag);
   }
   static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)
   {
-    adcId = uint8_t(adcId) & ~(1u << bitFlag);
+    adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     adcId = flag;
   }
   void setFlag(fit::EEventDataBit bitFlag, bool value)
   {
-    adcId = uint8_t(adcId) | uint8_t(value) << bitFlag;
+    adcId = uint8_t(adcId) | uint8_t(value) << uint8_t(bitFlag);
   }
   bool getFlag(fit::EEventDataBit bitFlag) const
   {
-    return bool(uint8_t(adcId) & (1u << bitFlag));
+    return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
   }
   bool areAllFlagsGood() const
   {
diff --git a/DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h b/DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h
@@ -55,23 +55,23 @@ struct ChannelDataFloat {
 
   static void setFlag(fit::EEventDataBit bitFlag, int& chainQTC)
   {
-    ChainQTC = uint8_t(ChainQTC) | 1u << bitFlag;
+    ChainQTC = uint8_t(ChainQTC) | 1u << uint8_t(bitFlag);
   }
   static void clearFlag(fit::EEventDataBit bitFlag, int& chainQTC)
   {
-    ChainQTC = uint8_t(ChainQTC) & ~(1u << bitFlag);
+    ChainQTC = uint8_t(ChainQTC) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     ChainQTC = flag;
   }
   void setFlag(fit::EEventDataBit bitFlag, bool value)
   {
-    ChainQTC = uint8_t(ChainQTC) | uint8_t(value) << bitFlag;
+    ChainQTC = uint8_t(ChainQTC) | uint8_t(value) << uint8_t(bitFlag);
   }
   bool getFlag(fit::EEventDataBit bitFlag) const
   {
-    return bool(uint8_t(ChainQTC) & (1u << bitFlag));
+    return bool(uint8_t(ChainQTC) & (1u << uint8_t(bitFlag)));
   }
   bool areAllFlagsGood() const
   {
diff --git a/DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RecPoints.h b/DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RecPoints.h
@@ -48,19 +48,19 @@ struct ChannelDataFloat {
 
   static void setFlag(fit::EEventDataBit bitFlag, int& adcId)
   {
-    adcId = uint8_t(adcId) | 1u << bitFlag;
+    adcId = uint8_t(adcId) | 1u << uint8_t(bitFlag);
   }
   static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)
   {
-    adcId = uint8_t(adcId) & ~(1u << bitFlag);
+    adcId = uint8_t(adcId) & ~(1u << uint8_t(bitFlag));
   }
   void setFlag(int flag)
   {
     adcId = flag;
   }
   bool getFlag(fit::EEventDataBit bitFlag)
   {
-    return bool(uint8_t(adcId) & (1u << bitFlag));
+    return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
   }
   bool areAllFlagsGood() const
   {

Original file line number	Diff line number	Diff line change
`@@ -49,23 +49,23 @@ struct ChannelDataFloat {`
`49`	`49`
`50`	`50`	`static void setFlag(fit::EEventDataBit bitFlag, int& adcId)`
`51`	`51`	`{`
`52`		`- adcId = uint8_t(adcId) \| 1u << bitFlag;`
	`52`	`+ adcId = uint8_t(adcId) \| 1u << uint8_t(bitFlag);`
`53`	`53`	`}`
`54`	`54`	`static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)`
`55`	`55`	`{`
`56`		`- adcId = uint8_t(adcId) & ~(1u << bitFlag);`
	`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`	`62`	`void setFlag(fit::EEventDataBit bitFlag, bool value)`
`63`	`63`	`{`
`64`		`- adcId = uint8_t(adcId) \| uint8_t(value) << bitFlag;`
	`64`	`+ adcId = uint8_t(adcId) \| uint8_t(value) << uint8_t(bitFlag);`
`65`	`65`	`}`
`66`	`66`	`bool getFlag(fit::EEventDataBit bitFlag) const`
`67`	`67`	`{`
`68`		`- return bool(uint8_t(adcId) & (1u << bitFlag));`
	`68`	`+ return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));`
`69`	`69`	`}`
`70`	`70`	`bool areAllFlagsGood() const`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,23 +55,23 @@ struct ChannelDataFloat {`
`55`	`55`
`56`	`56`	`static void setFlag(fit::EEventDataBit bitFlag, int& chainQTC)`
`57`	`57`	`{`
`58`		`- ChainQTC = uint8_t(ChainQTC) \| 1u << bitFlag;`
	`58`	`+ ChainQTC = uint8_t(ChainQTC) \| 1u << uint8_t(bitFlag);`
`59`	`59`	`}`
`60`	`60`	`static void clearFlag(fit::EEventDataBit bitFlag, int& chainQTC)`
`61`	`61`	`{`
`62`		`- ChainQTC = uint8_t(ChainQTC) & ~(1u << bitFlag);`
	`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`	`68`	`void setFlag(fit::EEventDataBit bitFlag, bool value)`
`69`	`69`	`{`
`70`		`- ChainQTC = uint8_t(ChainQTC) \| uint8_t(value) << bitFlag;`
	`70`	`+ ChainQTC = uint8_t(ChainQTC) \| uint8_t(value) << uint8_t(bitFlag);`
`71`	`71`	`}`
`72`	`72`	`bool getFlag(fit::EEventDataBit bitFlag) const`
`73`	`73`	`{`
`74`		`- return bool(uint8_t(ChainQTC) & (1u << bitFlag));`
	`74`	`+ return bool(uint8_t(ChainQTC) & (1u << uint8_t(bitFlag)));`
`75`	`75`	`}`
`76`	`76`	`bool areAllFlagsGood() const`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,19 @@ struct ChannelDataFloat {`
`48`	`48`
`49`	`49`	`static void setFlag(fit::EEventDataBit bitFlag, int& adcId)`
`50`	`50`	`{`
`51`		`- adcId = uint8_t(adcId) \| 1u << bitFlag;`
	`51`	`+ adcId = uint8_t(adcId) \| 1u << uint8_t(bitFlag);`
`52`	`52`	`}`
`53`	`53`	`static void clearFlag(fit::EEventDataBit bitFlag, int& adcId)`
`54`	`54`	`{`
`55`		`- adcId = uint8_t(adcId) & ~(1u << bitFlag);`
	`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`	`61`	`bool getFlag(fit::EEventDataBit bitFlag)`
`62`	`62`	`{`
`63`		`- return bool(uint8_t(adcId) & (1u << bitFlag));`
	`63`	`+ return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));`
`64`	`64`	`}`
`65`	`65`	`bool areAllFlagsGood() const`
`66`	`66`	`{`