FT0 calib&reco update (#10480)

* FIT: new reconstruction filtering

* FIT calibration: temporary hotfix for output subspec definition

* FIT reconstruction: some cosmetics and bugfix

* FIT calibration: new feature for debugging - extraInfo option, applied only for FT0 time spectra calibration

* FIT calibration: minor fixes

FIT reco: new calib object added

FIT calib&reco: new features and fixes

* FT0 reco: cosmetics

* FIT calib: hotfix for extra option for debugging mode

* Update CollisionTimeRecoTask.cxx

* Update FT0TimeOffsetSlotContainer.cxx

Co-authored-by: flptestfit <flp@flptestfit.cern.ch>

Author: afurs

DataFormats/Detectors/FIT/FT0/CMakeLists.txt

@@ -13,6 +13,7 @@ o2_add_library(DataFormatsFT0
   SOURCES src/ChannelData.cxx
           src/Digit.cxx
           src/DigitFilterParam.cxx
+          src/CalibParam.cxx
           src/RecPoints.cxx
           src/RawEventData.cxx
           src/CTF.cxx
@@ -28,6 +29,7 @@ o2_target_root_dictionary(DataFormatsFT0
   HEADERS include/DataFormatsFT0/ChannelData.h
           include/DataFormatsFT0/Digit.h
           include/DataFormatsFT0/DigitFilterParam.h
+          include/DataFormatsFT0/CalibParam.h
           include/DataFormatsFT0/MCLabel.h
           include/DataFormatsFT0/HitType.h
           include/DataFormatsFT0/RecPoints.h

…tion/include/FT0Calibration/CalibParam.h …/FT0/include/DataFormatsFT0/CalibParam.hDetectors/FIT/FT0/calibration/include/FT0Calibration/CalibParam.h renamed to DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/CalibParam.h Detectors/FIT/FT0/calibration/include/FT0Calibration/CalibParam.h renamed to DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/CalibParam.h

@@ -27,18 +27,18 @@ struct CalibParam : o2::conf::ConfigurableParamHelper<CalibParam> {
   // Logic for obtaining bad channels and for making decision concerning slot finalization
   std::size_t mMinEntriesThreshold = 500;  // Min number of entries
   std::size_t mMaxEntriesThreshold = 1000; // Max number of entries
-  uint8_t mNExtraSlots = 1;                // Number of extra slots
+  uint8_t mNExtraSlots = 0;                // Number of extra slots
   // Fitting ranges
   double mMinFitRange = -200.; // Min fit range
   double mMaxFitRange = 200.;  // Max fit range
   // Conditions for checking fit quality, otherwise hist mean will be taken as offset
-  double mMaxDiffMean = 20;                 // Max differnce between mean and fit result
+  double mMaxDiffMean = 5;                  // Max differnce between mean and fit result
   double mMinRMS = 3;                       // Min RMS
-  double mMaxSigma = 30;                    // Max fit sigma
+  double mMaxSigma = 32;                    // Max fit sigma
   int mRebinFactorPerChID[Nchannels] = {0}; //[Nchannels]
   //
-  bool mUseDynamicRange = false; // use dynamic ranges [mean-RMS*mRangeInRMS,mean+RMS*mRangeInRMS] for fitting
-  double mRangeInRMS = 3;        // Range for RMS in dynamic case
+  bool mUseDynamicRange = true; // use dynamic ranges [mean-RMS*mRangeInRMS,mean+RMS*mRangeInRMS] for fitting
+  double mRangeInRMS = 1.5;     // Range for RMS in dynamic case
 
   O2ParamDef(CalibParam, "FT0CalibParam");
 };

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/DigitFilterParam.h

@@ -33,5 +33,70 @@ struct DigitFilterParam : o2::conf::ConfigurableParamHelper<DigitFilterParam> {
 
   O2ParamDef(DigitFilterParam, "FT0DigitFilterParam");
 };
+
+struct ChannelFilterParam : o2::conf::ConfigurableParamHelper<ChannelFilterParam> {
+  int16_t mAmpUpper = 4200;
+  int16_t mAmpLower = -4200;
+  int16_t mTimeUpper = 2050;
+  int16_t mTimeLower = -2050;
+
+  uint8_t mPMbitsGood = (1 << ChannelData::EEventDataBit::kIsCFDinADCgate); // use only in ADC gate amplitudes, for physics
+  uint8_t mPMbitsBad = 0;                                                   // no checking for bad bits
+  uint8_t mPMbitsToCheck = mPMbitsGood | mPMbitsBad;
+
+  uint8_t mTrgBitsGood = (1 << Triggers::bitDataIsValid); // only good data
+  uint8_t mTrgBitsBad = 0;                                // Laser haven't been used in 2022, no check for bad bits
+  uint8_t mTrgBitsToCheck = mTrgBitsGood | mTrgBitsBad;
+  bool checkPMbits(uint8_t pmBits) const
+  {
+    return (pmBits & mPMbitsToCheck) == mPMbitsGood;
+  }
+  bool checkTCMbits(uint8_t tcmBits) const
+  {
+    return (tcmBits & mTrgBitsToCheck) == mTrgBitsGood;
+  }
+  bool checkTimeWindow(int16_t time) const
+  {
+    return time >= mTimeLower && time <= mTimeUpper;
+  }
+  bool checkAmpWindow(int16_t amp) const
+  {
+    return amp >= mAmpLower && amp <= mAmpUpper;
+  }
+  bool checkAll(const o2::ft0::ChannelData& channelData) const
+  {
+    return checkPMbits(channelData.ChainQTC) && checkAmpWindow(channelData.QTCAmpl) && checkTimeWindow(channelData.CFDTime);
+  }
+  O2ParamDef(ChannelFilterParam, "FT0ChannelFilterParam");
+};
+
+struct TimeFilterParam : o2::conf::ConfigurableParamHelper<TimeFilterParam> {
+  int16_t mAmpUpper = 4200;
+  int16_t mAmpLower = -4200;
+  int16_t mTimeUpper = 2050;
+  int16_t mTimeLower = -2050;
+
+  uint8_t mPMbitsGood = 0;                                                                                                          // No need in checking good PM bits
+  uint8_t mPMbitsBad = (1 << ChannelData::EEventDataBit::kIsTimeInfoNOTvalid) | (1 << ChannelData::EEventDataBit::kIsTimeInfoLost); // Check only two bad PM bits
+  uint8_t mPMbitsToCheck = mPMbitsGood | mPMbitsBad;
+  bool checkPMbits(uint8_t pmBits) const
+  {
+    return (pmBits & mPMbitsToCheck) == mPMbitsGood;
+  }
+  bool checkTimeWindow(int16_t time) const
+  {
+    return time >= mTimeLower && time <= mTimeUpper;
+  }
+  bool checkAmpWindow(int16_t amp) const
+  {
+    return amp >= mAmpLower && amp <= mAmpUpper;
+  }
+  bool checkAll(const o2::ft0::ChannelData& channelData) const
+  {
+    return checkPMbits(channelData.ChainQTC) && checkAmpWindow(channelData.QTCAmpl) && checkTimeWindow(channelData.CFDTime);
+  }
+  O2ParamDef(TimeFilterParam, "FT0TimeFilterParam");
+};
+
 } // namespace o2::ft0
 #endif

…s/FIT/FT0/calibration/src/CalibParam.cxx …ats/Detectors/FIT/FT0/src/CalibParam.cxxDetectors/FIT/FT0/calibration/src/CalibParam.cxx renamed to DataFormats/Detectors/FIT/FT0/src/CalibParam.cxx Detectors/FIT/FT0/calibration/src/CalibParam.cxx renamed to DataFormats/Detectors/FIT/FT0/src/CalibParam.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "FT0Calibration/CalibParam.h"
+#include "DataFormatsFT0/CalibParam.h"
 
 using namespace o2::ft0;
 O2ParamImpl(CalibParam);

DataFormats/Detectors/FIT/FT0/src/DataFormatsFT0LinkDef.h

@@ -17,6 +17,9 @@
 
 #pragma link C++ class o2::ft0::Digit + ;
 #pragma link C++ class o2::ft0::DigitFilterParam + ;
+#pragma link C++ class o2::ft0::ChannelFilterParam + ;
+#pragma link C++ class o2::ft0::TimeFilterParam + ;
+#pragma link C++ class o2::ft0::CalibParam + ;
 #pragma link C++ class o2::ft0::ChannelData + ;
 #pragma link C++ class o2::ft0::DetTrigInput + ;
 #pragma link C++ class o2::ft0::TriggersExt + ;

DataFormats/Detectors/FIT/FT0/src/DigitFilterParam.cxx

@@ -12,4 +12,6 @@
 #include "DataFormatsFT0/DigitFilterParam.h"
 
 using namespace o2::ft0;
-O2ParamImpl(DigitFilterParam);
+O2ParamImpl(DigitFilterParam);
+O2ParamImpl(ChannelFilterParam);
+O2ParamImpl(TimeFilterParam);

Detectors/FIT/FT0/calibration/CMakeLists.txt

@@ -11,7 +11,6 @@
 
 o2_add_library(FT0Calibration
         SOURCES
-        src/CalibParam.cxx
         src/FT0TimeOffsetSlotContainer.cxx
         src/GlobalOffsetsContainer.cxx
         src/FT0CalibTimeSlewing.cxx
@@ -28,7 +27,6 @@ o2_add_library(FT0Calibration
            )
        o2_target_root_dictionary(FT0Calibration
         HEADERS
-        include/FT0Calibration/CalibParam.h
         include/FT0Calibration/FT0TimeOffsetSlotContainer.h
         include/FT0Calibration/GlobalOffsetsContainer.h
         include/FT0Calibration/FT0CalibTimeSlewing.h

Detectors/FIT/FT0/calibration/include/FT0Calibration/FT0TimeOffsetSlotContainer.h

@@ -18,6 +18,8 @@
 #include "CommonDataFormat/FlatHisto2D.h"
 #include "DataFormatsFT0/SpectraInfoObject.h"
 
+#include "TList.h"
+
 #include "Rtypes.h"
 namespace o2::ft0
 {
@@ -34,10 +36,10 @@ class FT0TimeOffsetSlotContainer final
   FT0TimeOffsetSlotContainer& operator=(FT0TimeOffsetSlotContainer&&) = default;
   bool hasEnoughEntries() const;
   void fill(const gsl::span<const float>& data);
-  SpectraInfoObject getSpectraInfoObject(std::size_t channelID) const;
+  SpectraInfoObject getSpectraInfoObject(std::size_t channelID, TList* listHists) const;
   void merge(FT0TimeOffsetSlotContainer* prev);
   void print() const;
-  TimeSpectraInfoObject generateCalibrationObject() const;
+  TimeSpectraInfoObject generateCalibrationObject(long tsStartMS, long tsEndMS, const std::string& pathToHists) const;
   typedef float FlatHistoValue_t;
   typedef o2::dataformats::FlatHisto2D<FlatHistoValue_t> FlatHisto2D_t;
 

Detectors/FIT/FT0/calibration/include/FT0Calibration/GlobalOffsetsContainer.h

@@ -38,7 +38,7 @@ class GlobalOffsetsContainer final
   int getMeanGaussianFitValue() const;
   void merge(GlobalOffsetsContainer* prev);
   void print() const;
-  GlobalOffsetsCalibrationObject generateCalibrationObject() const;
+  GlobalOffsetsCalibrationObject generateCalibrationObject(long, long, const std::string&) const;
   void updateFirstCreation(std::uint64_t creation)
   {
     if (creation < mFirstCreation) {

Detectors/FIT/FT0/calibration/src/FT0CalibrationLinkDef.h

@@ -15,7 +15,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::ft0::CalibParam + ;
 #pragma link C++ class o2::ft0::FT0TimeOffsetSlotContainer + ;
 #pragma link C++ class o2::ft0::GlobalOffsetsContainer + ;
 #pragma link C++ class o2::ft0::FT0CalibTimeSlewing + ;