IDCs: optimize outlier filtering

matthias-kleiner · davidrohr · commit 0ff6d351db96 · 2022-10-17T09:42:14.000+02:00
diff --git a/Detectors/TPC/calibration/include/TPCCalibration/IDCFactorization.h b/Detectors/TPC/calibration/include/TPCCalibration/IDCFactorization.h
@@ -338,7 +338,7 @@ class IDCFactorization : public IDCGroupHelperSector
   std::unique_ptr<CalDet<float>> mGainMap;                          ///<! static Gain map object used for filling missing IDC_0 values
   std::unique_ptr<CalDet<PadFlags>> mPadFlagsMap;                   ///< status flag for each pad (i.e. if the pad is dead)
   bool mInputGrouped{false};                                        ///< flag which is set to true if the input IDCs are grouped (checked via the grouping parameters from the constructor)
-  bool mUsePadStatusMap{false};                                     ///< flag for using the pad-by-pad status map during the factorization of the IDCs
+  bool mUsePadStatusMap{true};                                      ///< flag for using the pad-by-pad status map during the factorization of the IDCs
   const std::vector<uint32_t> mCRUs{};                              ///< CRUs to process in this instance
   std::array<unsigned int, SIDES> mSideIndex{0, 1};                 ///< index to mIDCZero, mIDCOne and mIDCDelta for TPC side
   std::vector<Side> mSides{};                                       ///< processed TPC sides
diff --git a/Detectors/TPC/calibration/include/TPCCalibration/IDCGroupingParameter.h b/Detectors/TPC/calibration/include/TPCCalibration/IDCGroupingParameter.h
@@ -47,6 +47,8 @@ struct ParameterIDCGroup : public o2::conf::ConfigurableParamHelper<ParameterIDC
   float sigma = 3.f;                                                                    ///< sigma cut which can be used during the grouping for outlier filtering
   float minIDC0Median = 6;                                                              ///< this value is used for identifying outliers (pads with high IDC0 values): "accepted IDC 0 values > median_IDC0 + stdDev * minIDC0Median"
   float maxIDC0Median = 6;                                                              ///< this value is used for identifying outliers (pads with high IDC0 values): "accepted IDC 0 values < median_IDC0 + stdDev * maxIDC0Median"
+  int minIDC0Val = 1;                                                                   ///< minimum accepted IDC0 value (should be larger than 0 in case of real data)
+  int maxIDC0Val = 150;                                                                 ///< maximum accepted IDC0 value (max IDC0 for 3MHz pp ~30)
 
   /// Helper function for setting the groupimg parameters from a string (can be "X": parameters in all regions are "X" or can be "1,2,3,4,5,6,7,8,9,10" for setting individual regions)
   /// \param sgroupPads string for grouping parameter in pad direction
diff --git a/Detectors/TPC/calibration/src/IDCFactorization.cxx b/Detectors/TPC/calibration/src/IDCFactorization.cxx
@@ -456,17 +456,17 @@ void o2::tpc::IDCFactorization::createStatusMap()
 
           if (iter == 0) {
             // exclude dead pads
-            if (idcZeroVal != -1) {
+            if ((idcZeroVal != -1) && (idcZeroVal > paramIDCGroup.minIDC0Val) && (idcZeroVal < paramIDCGroup.maxIDC0Val)) {
               average.addValue(idcZeroVal);
             }
           } else {
             const unsigned int padInRegion = Mapper::OFFSETCRULOCAL[region][lrow] + pad;
             o2::tpc::PadFlags flag = o2::tpc::PadFlags::flagGoodPad;
             if (idcZeroVal == -1) {
               flag = o2::tpc::PadFlags::flagDeadPad | o2::tpc::PadFlags::flagSkip | mPadFlagsMap->getCalArray(cru).getValue(padInRegion);
-            } else if (idcZeroVal > median + stdDev * paramIDCGroup.maxIDC0Median) {
+            } else if ((idcZeroVal > paramIDCGroup.maxIDC0Val) || (idcZeroVal > median + stdDev * paramIDCGroup.maxIDC0Median)) {
               flag = o2::tpc::PadFlags::flagHighPad | o2::tpc::PadFlags::flagSkip | mPadFlagsMap->getCalArray(cru).getValue(padInRegion);
-            } else if (idcZeroVal < median - stdDev * paramIDCGroup.minIDC0Median) {
+            } else if ((idcZeroVal < paramIDCGroup.minIDC0Val) || (idcZeroVal < median - stdDev * paramIDCGroup.minIDC0Median)) {
               flag = o2::tpc::PadFlags::flagLowPad | o2::tpc::PadFlags::flagSkip | mPadFlagsMap->getCalArray(cru).getValue(padInRegion);
             }
             mPadFlagsMap->getCalArray(cru).setValue(padInRegion, flag);
