Implemented side-wise amplitude condition check in FDD reco

Author: wpierozak

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

@@ -18,7 +18,8 @@
 namespace o2::fdd
 {
 struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
-  enum DetectorSide {SideA = 0, SideC = 1}
+  enum DetectorSide { SideA = 0,
+                      SideC = 1 };
   int16_t ChannelAmplitudeUpper[2] = {4096, 4096};
   int16_t ChannelAmplitudeLower[2] = {6, 0};
 
@@ -39,7 +40,7 @@ struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
     return (flags & TriggerBitsValidationMask) == TriggerBitsValid;
   }
 
-  int16_t CollisionTimeAmpltudeUpper[2]= {4096, 4096};
+  int16_t CollisionTimeAmpltudeUpper[2] = {4096, 4096};
   int16_t CollisionTimeAmplitudeLower[2] = {6, 0};
   int16_t CollisionTimeTimeLower = -500;
   int16_t CollisionTimeTimeUpper = 500;

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

@@ -44,9 +44,9 @@ class Reconstructor
  private:
   static constexpr uint8_t coincidencePairs[Nchannels] = {4, 5, 6, 7, 0, 1, 2, 3, 12, 13, 14, 15, 8, 9, 10, 11};
 
-  bool isInAmplitudeWindow(int16_t amplitude)
+  bool isInAmplitudeWindow(int16_t amplitude, FDDRecoConfig::DetectorSide side)
   {
-    return amplitude > FDDRecoConfig::Instance().ChannelAmplitudeLower && amplitude < FDDRecoConfig::Instance().ChannelAmplitudeUpper;
+    return amplitude > FDDRecoConfig::Instance().ChannelAmplitudeLower[side] && amplitude < FDDRecoConfig::Instance().ChannelAmplitudeUpper[side];
   }
   bool isInTimeWindow(int16_t time)
   {
@@ -57,9 +57,9 @@ class Reconstructor
     return FDDRecoConfig::Instance().isChannelDataGood(channelBits);
   }
 
-  bool isInCollisionTimeAmplitudeWindow(int16_t amplitude)
+  bool isInCollisionTimeAmplitudeWindow(int16_t amplitude, FDDRecoConfig::DetectorSide side)
   {
-    return amplitude > FDDRecoConfig::Instance().CollisionTimeAmplitudeLower && amplitude < FDDRecoConfig::Instance().CollisionTimeAmpltudeUpper;
+    return amplitude > FDDRecoConfig::Instance().CollisionTimeAmplitudeLower[side] && amplitude < FDDRecoConfig::Instance().CollisionTimeAmpltudeUpper[side];
   }
   bool isInCollisionTimeTimeWindow(int16_t time)
   {
@@ -70,14 +70,9 @@ class Reconstructor
     return FDDRecoConfig::Instance().isChannelDataGoodForCollisionTime(channelBits);
   }
 
-  bool checkSwOrGateConditions(const ChannelData& channelData)
+  bool checkSwOrGateConditions(const ChannelData& channelData, FDDRecoConfig::DetectorSide side)
   {
-    bool isAmplitudeInRange = false;
-    if (channelData.mPMNumber >= sSideAStartId) {
-      isAmplitudeInRange = channelData.mChargeADC > FDDRecoConfig::Instance().SwOrTriggerAmplitudeLowThresholdSideA && channelData.mChargeADC < FDDRecoConfig::Instance().SwOrTriggerAmplitudeHighThresholdSideA;
-    } else {
-      isAmplitudeInRange = channelData.mChargeADC > FDDRecoConfig::Instance().SwOrTriggerAmplitudeLowThresholdSideC && channelData.mChargeADC < FDDRecoConfig::Instance().SwOrTriggerAmplitudeHighThresholdSideC;
-    }
+    bool isAmplitudeInRange = channelData.mChargeADC > FDDRecoConfig::Instance().SwOrTriggerAmplitudeLowThreshold[side] && channelData.mChargeADC < FDDRecoConfig::Instance().SwOrTriggerAmplitudeHighThreshold[side];
     bool isInTimeWindow = std::abs(channelData.mTime) < FDDRecoConfig::Instance().SwOrGate;
     return isAmplitudeInRange && isInTimeWindow && FDDRecoConfig::Instance().isChannelDataGoodForSwTrigger(channelData.mFEEBits);
   }

Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx

@@ -53,7 +53,8 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
       LOG(debug) << "Channel " << channelData.mPMNumber << " is dead - discarding data";
       continue;
     }
-    if (!isInAmplitudeWindow(channelData.mChargeADC) || !isInTimeWindow(channelData.mTime) || !isChannelDataGood(channelData.mFEEBits)) {
+    const auto side = channelData.mPMNumber >= sSideAStartId ? FDDRecoConfig::SideA : FDDRecoConfig::SideC;
+    if (!isInAmplitudeWindow(channelData.mChargeADC, side) || !isInTimeWindow(channelData.mTime) || !isChannelDataGood(channelData.mFEEBits)) {
       continue;
     }
     const auto& chNum = channelData.mPMNumber;
@@ -63,7 +64,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
     storedEntries++;
 
     if (FDDRecoConfig::Instance().SwTriggerEnabled) {
-      coincidencePairsOrTrg[chNum] |= checkSwOrGateConditions(channelData);
+      coincidencePairsOrTrg[chNum] |= checkSwOrGateConditions(channelData, side);
       coincidencePairsTime[chNum] = channelData.mTime;
       if (FDDRecoConfig::Instance().SwTriggerCoincidenceMode && coincidencePairsOrTrg[chNum] && coincidencePairsOrTrg[coincidencePairs[chNum]]) {
         if (chNum >= sSideAStartId) {
@@ -88,7 +89,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
       }
     }
 
-    if (!isChannelDataGoodForCollisionTime(channelData.mFEEBits) || !isInCollisionTimeAmplitudeWindow(channelData.mChargeADC) || !isInCollisionTimeTimeWindow(channelData.mTime)) {
+    if (!isChannelDataGoodForCollisionTime(channelData.mFEEBits) || !isInCollisionTimeAmplitudeWindow(channelData.mChargeADC, side) || !isInCollisionTimeTimeWindow(channelData.mTime)) {
       continue;
     }