Skip to content

Commit 5726ce2

Browse files
committed
FIT: ChannelDataFloat: Changed amplitude and time field datatypes back to double
1 parent ebc1181 commit 5726ce2

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ namespace fdd
3030
struct ChannelDataFloat {
3131
static constexpr int DUMMY_CHANNEL_ID = -1;
3232
static constexpr int DUMMY_CHAIN_QTC = -1;
33-
static constexpr float DUMMY_CFD_TIME = -20000;
34-
static constexpr float DUMMY_QTC_AMPL = -20000;
33+
static constexpr double DUMMY_CFD_TIME = -20000;
34+
static constexpr double DUMMY_QTC_AMPL = -20000;
3535

3636
int mPMNumber = DUMMY_CHANNEL_ID; ///< Channel ID
3737
int adcId = DUMMY_CHAIN_QTC; ///< Channel data bits
38-
float mTime = DUMMY_CFD_TIME; ///< Channel time (ns), 0 at the LHC clock center
39-
float mChargeADC = DUMMY_QTC_AMPL; ///< Channel charge (ADC channels)
38+
double mTime = DUMMY_CFD_TIME; ///< Channel time (ns), 0 at the LHC clock center
39+
double mChargeADC = DUMMY_QTC_AMPL; ///< Channel charge (ADC channels)
4040

4141
ChannelDataFloat() = default;
4242
ChannelDataFloat(int Channel, double Time, double Charge, int AdcId)
@@ -80,8 +80,8 @@ struct ChannelDataFloat {
8080

8181
void print() const;
8282
int getChannelId() const { return mPMNumber; }
83-
float getTime() const { return mTime; }
84-
float getAmp() const { return mChargeADC; }
83+
double getTime() const { return mTime; }
84+
double getAmp() const { return mChargeADC; }
8585
bool operator==(const ChannelDataFloat&) const = default;
8686

8787
ClassDefNV(ChannelDataFloat, 1);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ namespace fv0
2929
struct ChannelDataFloat {
3030
static constexpr int DUMMY_CHANNEL_ID = -1;
3131
static constexpr int DUMMY_CHAIN_QTC = -1;
32-
static constexpr float DUMMY_CFD_TIME = -20000.0;
33-
static constexpr float DUMMY_QTC_AMPL = -20000.0;
32+
static constexpr double DUMMY_CFD_TIME = -20000.0;
33+
static constexpr double DUMMY_QTC_AMPL = -20000.0;
3434

3535
int channel = DUMMY_CHANNEL_ID; ///< Channel ID
3636
float time = DUMMY_CFD_TIME; ///< Channel time (ns), 0 at the LHC clock center
@@ -79,8 +79,8 @@ struct ChannelDataFloat {
7979

8080
void print() const;
8181
int getChannelId() const { return channel; }
82-
float getTime() const { return time; }
83-
float getAmp() const { return charge; }
82+
double getTime() const { return time; }
83+
double getAmp() const { return charge; }
8484
bool operator==(const ChannelDataFloat&) const = default;
8585

8686
ClassDefNV(ChannelDataFloat, 1);

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/ChannelDataBit.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ enum class ChannelDataBit { kNumberADC = 0,
3333
kIsTimeInfoLost
3434
};
3535

36-
template<typename IntegerType>
37-
requires std::integral<IntegerType>
36+
template <typename IntegerType>
37+
requires std::integral<IntegerType>
3838
IntegerType operator<<(IntegerType n, ChannelDataBit bitFlag)
3939
{
40-
return n << static_cast<int>(bitFlag);
40+
return n << static_cast<int>(bitFlag);
4141
}
4242
}
4343
} // namespace o2

0 commit comments

Comments
 (0)