Skip to content

Commit ccba8f6

Browse files
wpierozakwpierozak
authored andcommitted
Changed collision time conditions to inclusive
1 parent 2aae5d2 commit ccba8f6

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace o2::fdd
2020
struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
2121
enum DetectorSide { SideA = 0,
2222
SideC = 1 };
23-
int16_t ChannelAmplitudeUpper[2] = {4096, 4096};
23+
int16_t ChannelAmplitudeUpper[2] = {4095, 4095};
2424
int16_t ChannelAmplitudeLower[2] = {0, 0};
2525

2626
int16_t ChannelTimeLower = -2050;
@@ -40,7 +40,7 @@ struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
4040
return (flags & TriggerBitsValidationMask) == TriggerBitsValid;
4141
}
4242

43-
int16_t CollisionTimeAmpltudeUpper[2] = {4096, 4096};
43+
int16_t CollisionTimeAmpltudeUpper[2] = {4095, 4095};
4444
int16_t CollisionTimeAmplitudeLower[2] = {0, 0};
4545
int16_t CollisionTimeTimeLower = -153;
4646
int16_t CollisionTimeTimeUpper = 153;

‎Detectors/FIT/FDD/reconstruction/include/FDDReconstruction/Reconstructor.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class Reconstructor
4646

4747
bool isInAmplitudeWindow(int16_t amplitude, FDDRecoConfig::DetectorSide side)
4848
{
49-
return amplitude > FDDRecoConfig::Instance().ChannelAmplitudeLower[side] && amplitude < FDDRecoConfig::Instance().ChannelAmplitudeUpper[side];
49+
return amplitude >= FDDRecoConfig::Instance().ChannelAmplitudeLower[side] && amplitude <= FDDRecoConfig::Instance().ChannelAmplitudeUpper[side];
5050
}
5151
bool isInTimeWindow(int16_t time)
5252
{
53-
return time > FDDRecoConfig::Instance().ChannelTimeLower && time < FDDRecoConfig::Instance().ChannelTimeUpper;
53+
return time >= FDDRecoConfig::Instance().ChannelTimeLower && time <= FDDRecoConfig::Instance().ChannelTimeUpper;
5454
}
5555
bool isChannelDataGood(uint8_t channelBits)
5656
{
@@ -59,11 +59,11 @@ class Reconstructor
5959

6060
bool isInCollisionTimeAmplitudeWindow(int16_t amplitude, FDDRecoConfig::DetectorSide side)
6161
{
62-
return amplitude > FDDRecoConfig::Instance().CollisionTimeAmplitudeLower[side] && amplitude < FDDRecoConfig::Instance().CollisionTimeAmpltudeUpper[side];
62+
return amplitude >= FDDRecoConfig::Instance().CollisionTimeAmplitudeLower[side] && amplitude <= FDDRecoConfig::Instance().CollisionTimeAmpltudeUpper[side];
6363
}
6464
bool isInCollisionTimeTimeWindow(int16_t time)
6565
{
66-
return time > FDDRecoConfig::Instance().CollisionTimeTimeLower && time < FDDRecoConfig::Instance().CollisionTimeTimeUpper;
66+
return time >= FDDRecoConfig::Instance().CollisionTimeTimeLower && time <= FDDRecoConfig::Instance().CollisionTimeTimeUpper;
6767
}
6868
bool isChannelDataGoodForCollisionTime(uint8_t channelBits)
6969
{

0 commit comments

Comments
 (0)