draft

Author: Wiktor Pierozak

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

@@ -18,23 +18,44 @@
 namespace o2::fdd
 {
 struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
-  float AmplitudeCutOnCollisionTimeWeights = 3;
-  float AmplitudeCollisionTimeCutSideA = 1.0;
-  float AmplitudeCollisionTimeCutSideC = 0.0;
+  int16_t ChannelAmplitudeUpper = 4096;
+  int16_t ChannelAmplitudeLower = 0;
+  int16_t ChannelTimeLower = -2050;
+  int16_t ChannelTimeUpper = 2050;
+
+  uint8_t ChannelValidPmInputFlagMask = 0;
+  uint8_t ChannelValidPmInputFlags = 0;
+  bool isChannelDataGoodForCollisionTime(uint8_t flags) const
+  {
+    return (flags & ChannelValidPmInputFlagMask) == ChannelValidPmInputFlags;
+  }
+
+  uint8_t TriggerBitsValidationMask = 0;
+  uint8_t TriggerBitsValid = 0;
+  bool areTriggerBitsGood(uint8_t flags) const 
+  {
+    return (flags & TriggerBitsValidationMask) == TriggerBitsValid;
+  }
+
+
+  int16_t CollisionTimeAmpltudeUpper = 4096;
+  int16_t CollisionTimeAmplitudeLower = 0;
+  int16_t CollisionTimeTimeLower = -2050;
+  int16_t CollisionTimeTimeUpper = 2050;
+
+  uint8_t CollisionTimeValidPmInputFlagMask = static_cast<uint8_t>(~(1u << ChannelData::kNumberADC));
+  uint8_t CollisionTimeValidPmInputFlags = static_cast<uint8_t>((1u << ChannelData::kIsCFDinADCgate) | (1u << ChannelData::kIsEventInTVDC));
+  bool isChannelDataGoodForCollisionTime(uint8_t flags) const
+  {
+    return (flags & CollisionTimeValidPmInputFlagMask) == CollisionTimeValidPmInputFlags;
+  }
 
   float SwTriggerTimeLowThreshold= -1.25;
   float SwTriggerTimeHighThreshold= 1.25;
   float SwTriggerAmplitudeLowThreshold = 0.0;
   float SwTriggerAmplitudeHighThreshold = 4096.0;
   bool SwTriggerEnabled = false;
 
-  uint8_t ValidPmInputFlagMask = static_cast<uint8_t>(~(1u << ChannelData::kNumberADC));
-  uint8_t ValidPmInputFlags = static_cast<uint8_t>((1u << ChannelData::kIsCFDinADCgate) | (1u << ChannelData::kIsEventInTVDC));
-  bool areChannelDataFlagsGood(uint8_t flags) const
-  {
-    return (flags & mValidPmInputFlagMask) == mValidPmInputFlags;
-  }
-
   O2ParamDef(FDDRecoConfig, "FDDRecoConfig");
   ClassDefNV(FDDRecoConfig, 1);
 };

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

@@ -18,6 +18,7 @@
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFDD/RecPoint.h"
 #include "DataFormatsFIT/DeadChannelMap.h"
+#include "DataFormatsFDD/FDDRecoConfig.h"
 namespace o2
 {
 namespace fdd
@@ -40,6 +41,10 @@ class Reconstructor
   }
 
  private:
+  bool isInAmplitudeWindow(int16_t amplitude) {
+    return amplitude >= FDDRecoConfig::Instance().ChannelAmplitudeLower && amplitude <= FDDRecoConfig::Instance().ChannelAmplitudeUpper;
+  }
+
   o2::fit::DeadChannelMap const* mDeadChannelMap = nullptr;
   ClassDefNV(Reconstructor, 3);
 };

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

@@ -38,6 +38,19 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
   bool atLeastOneVertexChannel = false;
   bool atLeastOneChannelInSwAmplitudeRange = false;
 
+  int64_t timeSideA = 0;
+  int64_t timeSideC = 0;
+  int64_t entriesNumSideA = 0;
+  int64_t entriesNumSideC = 0;
+
+  for (const auto& channelData: inChData) {
+    if (mDeadChannelMap && !mDeadChannelMap->isChannelAlive(channelData.mPMNumber)) {
+      LOG(debug) << "Channel " << channelData.mPMNumber << " is dead - discarding data";
+      continue;
+    }
+    
+  }
+
   for (int ich = 0; ich < nch; ich++) {
     if (mDeadChannelMap && !mDeadChannelMap->isChannelAlive(inChData[ich].mPMNumber)) {
       LOG(debug) << "Channel " << ich << " is dead - discarding data";