Skip to content

Commit 78fcd74

Browse files
committed
FIT: changed return type to float in fv0::ChannelDataFloat::getTime and fv0::ChannelDataFloat::getAmp; added no discard to getters in fv0::ChannelDataFloat, fdd::ChannelDataFloat, ft0::ChannelDataFloat
1 parent a3d205e commit 78fcd74

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecPoint.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ struct ChannelDataFloat {
6363
{
6464
adcId = uint8_t(adcId) | uint8_t(value) << uint8_t(bitFlag);
6565
}
66-
bool getFlag(fit::EEventDataBit bitFlag) const
66+
[[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
6767
{
6868
return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
6969
}
70-
bool areAllFlagsGood() const
70+
[[nodiscard]] bool areAllFlagsGood() const
7171
{
7272
return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
7373
!getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ struct ChannelDataFloat {
6969
{
7070
ChainQTC = uint8_t(ChainQTC) | uint8_t(value) << uint8_t(bitFlag);
7171
}
72-
bool getFlag(fit::EEventDataBit bitFlag) const
72+
[[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
7373
{
7474
return bool(uint8_t(ChainQTC) & (1u << uint8_t(bitFlag)));
7575
}
76-
bool areAllFlagsGood() const
76+
[[nodiscard]] bool areAllFlagsGood() const
7777
{
7878
return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
7979
!getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&

DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RecPoints.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ struct ChannelDataFloat {
5858
{
5959
adcId = flag;
6060
}
61-
bool getFlag(fit::EEventDataBit bitFlag) const
61+
[[nodiscard]] bool getFlag(fit::EEventDataBit bitFlag) const
6262
{
6363
return bool(uint8_t(adcId) & (1u << uint8_t(bitFlag)));
6464
}
65-
bool areAllFlagsGood() const
65+
[[nodiscard]] bool areAllFlagsGood() const
6666
{
6767
return (!getFlag(fit::EEventDataBit::kIsDoubleEvent) &&
6868
!getFlag(fit::EEventDataBit::kIsTimeInfoNOTvalid) &&
@@ -75,8 +75,8 @@ struct ChannelDataFloat {
7575

7676
void print() const;
7777
[[nodiscard]] int getChannelId() const { return channel; }
78-
[[nodiscard]] int getTime() const { return time; }
79-
[[nodiscard]] int getAmp() const { return charge; }
78+
[[nodiscard]] double getTime() const { return time; }
79+
[[nodiscard]] double getAmp() const { return charge; }
8080
bool operator==(const ChannelDataFloat&) const = default;
8181

8282
ClassDefNV(ChannelDataFloat, 1);

0 commit comments

Comments
 (0)