Merged Charge and Time fileters to one Fv0RecoConfig

Author: Wiktor Pierozak

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

@@ -13,34 +13,22 @@
 #define ALICEO2_FV0_DIGIT_FILTER_PARAM
 
 #include "CommonUtils/ConfigurableParamHelper.h"
+#include "DataFormatsFV0/ChannelData.h"
 
 namespace o2::fv0
 {
-struct FV0RecoChargeFilter : o2::conf::ConfigurableParamHelper<FV0RecoChargeFilter> {
+struct FV0RecoConfig : o2::conf::ConfigurableParamHelper<FV0RecoConfig> {
   double AmplitudeLowerThreshold = 24;     // only channels with amplitude higher will participate in calibration and collision time
   double AmplitudeThreholdForMeanTime = 5; // Charge threshold, only above which the time is taken into account in calculating the mean time of all qualifying channels
+  double TimeUpperThershold = 1000.0;      // only channels with time below will participate in calibration and collision time
+  uint8_t mValidPmInputFlagMask = ~(1u << ChannelData::kNumberADC);
+  uint8_t mValidPmInputFlags = static_cast<uint8_t>((1u << ChannelData::kIsCFDinADCgate) | (1u << ChannelData::kIsEventInTVDC));
 
-  bool validForMeanTimeCalculation(double charge) const
+  bool areChannelDataFlagsGood(uint8_t flags) const
   {
-    return charge > AmplitudeThreholdForMeanTime;
+    return (flags & mValidPmInputFlagMask) == mValidPmInputFlags;
   }
-
-  bool validForCalibrationAndCollisionTime(double charge) const
-  {
-    return charge > AmplitudeLowerThreshold;
-  }
-
-  O2ParamDef(FV0RecoChargeFilter, "FV0RecoChargeFilter");
-};
-
-struct FV0RecoTimeFilter : o2::conf::ConfigurableParamHelper<FV0RecoTimeFilter> {
-  double TimeUpperThershold = 1000.0; // only channels with time below will participate in calibration and collision time
-  bool validForCalibrationAndCollisionTime(double time) const
-  {
-    return time < TimeUpperThershold;
-  }
-
-  O2ParamDef(FV0RecoTimeFilter, "FV0RecoTimeFilter");
+  O2ParamDef(FV0RecoConfig, "FV0RecoConfig");
 };
 
 } // namespace o2::fv0

DataFormats/Detectors/FIT/FV0/src/DataFormatsFV0LinkDef.h

@@ -40,6 +40,5 @@
 #pragma link C++ class o2::fv0::FV0CalibrationInfoObject + ;
 #pragma link C++ class o2::fv0::FV0ChannelTimeCalibrationObject + ;
 
-#pragma link C++ class o2::fv0::FV0RecoChargeFilter + ;
-#pragma link C++ class o2::fv0::FV0RecoTimeFilter + ;
+#pragma link C++ class o2::fv0::FV0RecoConfig + ;
 #endif

DataFormats/Detectors/FIT/FV0/src/RecoFilterParam.cxx

@@ -12,5 +12,4 @@
 #include "DataFormatsFV0/RecoFilterParam.h"
 
 using namespace o2::fv0;
-O2ParamImpl(FV0RecoChargeFilter);
-O2ParamImpl(FV0RecoTimeFilter);
+O2ParamImpl(FV0RecoConfig);

Detectors/FIT/FV0/reconstruction/src/BaseRecoTask.cxx

@@ -57,14 +57,14 @@ RP BaseRecoTask::process(o2::fv0::Digit const& bcd,
     const auto& currentOutCh = outChData.back();
 
     // Conditions for reconstructing collision time (3 variants: first, average-relaxed and average-tight)
-    if (FV0RecoChargeFilter::Instance().validForMeanTimeCalculation(currentOutCh.charge)) {
+    if (currentOutCh.charge > FV0RecoConfig::Instance().AmplitudeThreholdForMeanTime) {
       sideAtimeFirst = std::min(static_cast<Double_t>(sideAtimeFirst), currentOutCh.time);
-      if (inChData[ich].areAllFlagsGood()) {
-        if (FV0RecoTimeFilter::Instance().validForCalibrationAndCollisionTime(std::abs(currentOutCh.time))) {
+      if (FV0RecoConfig::Instance().areChannelDataFlagsGood(inChData[ich].ChainQTC)) {
+        if (std::abs(currentOutCh.time) < FV0RecoConfig::Instance().TimeUpperThershold) {
           sideAtimeAvg += currentOutCh.time;
           ndigitsA++;
         }
-        if (FV0RecoChargeFilter::Instance().validForCalibrationAndCollisionTime(currentOutCh.charge) && FV0RecoTimeFilter::Instance().validForCalibrationAndCollisionTime(std::abs(currentOutCh.time))) {
+        if (currentOutCh.charge > FV0RecoConfig::Instance().AmplitudeLowerThreshold && std::abs(currentOutCh.time) < FV0RecoConfig::Instance().TimeUpperThershold) {
           sideAtimeAvgSelected += currentOutCh.time;
           ndigitsASelected++;
         }