FIT calibration: large refactoring (AliceO2Group#9559)

* FIT calibration: global refactoring + distributed time offset task

* FIT calibration: some refactoring and improvements for time offset workflows

* Flat histogram: copy assignment and init method

* FIT calibration: last modifications

* clang fixes

* Hotfix for time spectra workflow

* Update FITCalibrationDevice.h

Author: afurs

DataFormats/Detectors/FIT/FT0/CMakeLists.txt

@@ -12,31 +12,31 @@
 o2_add_library(DataFormatsFT0
   SOURCES src/ChannelData.cxx
           src/Digit.cxx
+          src/DigitFilterParam.cxx
           src/RecPoints.cxx
           src/RawEventData.cxx
           src/CTF.cxx
-          src/GlobalOffsetsCalibrationObject.cxx
-          src/GlobalOffsetsContainer.cxx
   PUBLIC_LINK_LIBRARIES O2::FT0Base
                         O2::DataFormatsFIT
                         O2::SimulationDataFormat
                         O2::CommonDataFormat
                         O2::Headers
                         O2::CCDB
-                        O2::DetectorsCalibration
 )
 
 o2_target_root_dictionary(DataFormatsFT0
   HEADERS include/DataFormatsFT0/ChannelData.h
           include/DataFormatsFT0/Digit.h
+          include/DataFormatsFT0/DigitFilterParam.h
           include/DataFormatsFT0/MCLabel.h
           include/DataFormatsFT0/HitType.h
           include/DataFormatsFT0/RecPoints.h
           include/DataFormatsFT0/RawEventData.h
           include/DataFormatsFT0/LookUpTable.h
           include/DataFormatsFT0/CTF.h
           include/DataFormatsFT0/RecoCalibInfoObject.h
+          include/DataFormatsFT0/FT0CalibrationInfoObject.h
+          include/DataFormatsFT0/FT0ChannelTimeCalibrationObject.h
           include/DataFormatsFT0/GlobalOffsetsInfoObject.h
           include/DataFormatsFT0/GlobalOffsetsCalibrationObject.h
-          include/DataFormatsFT0/GlobalOffsetsContainer.h
 )

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

@@ -0,0 +1,37 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file DigitFilterParam.h
+/// \brief Configurable digit filtering
+
+#ifndef ALICEO2_DIGIT_FILTER_PARAM
+#define ALICEO2_DIGIT_FILTER_PARAM
+
+#include "CommonUtils/ConfigurableParamHelper.h"
+#include "DataFormatsFT0/Digit.h"
+#include "DataFormatsFT0/ChannelData.h"
+
+namespace o2::ft0
+{
+struct DigitFilterParam : o2::conf::ConfigurableParamHelper<DigitFilterParam> {
+  int16_t mAmpThreshold = 10;
+  int16_t mTimeWindow = 153;
+  uint8_t mPMbitsGood = (1 << ChannelData::EEventDataBit::kIsCFDinADCgate) | (1 << ChannelData::EEventDataBit::kIsEventInTVDC);
+  uint8_t mPMbitsBad = (1 << ChannelData::EEventDataBit::kIsDoubleEvent) | (1 << ChannelData::EEventDataBit::kIsTimeInfoNOTvalid) | (1 << ChannelData::EEventDataBit::kIsTimeInfoLate) | (1 << ChannelData::EEventDataBit::kIsAmpHigh) | (1 << ChannelData::EEventDataBit::kIsTimeInfoLost);
+  uint8_t mPMbitsToCheck = mPMbitsGood | mPMbitsBad;
+  uint8_t mTrgBitsGood = (1 << Triggers::bitVertex) | (1 << Triggers::bitDataIsValid);
+  uint8_t mTrgBitsBad = (1 << Triggers::bitOutputsAreBlocked);
+  uint8_t mTrgBitsToCheck = mTrgBitsGood | mTrgBitsBad;
+
+  O2ParamDef(DigitFilterParam, "FT0DigitFilterParam");
+};
+} // namespace o2::ft0
+#endif

…T0Calibration/FT0CalibrationInfoObject.h …ataFormatsFT0/FT0CalibrationInfoObject.hDetectors/FIT/FT0/calibration/include/FT0Calibration/FT0CalibrationInfoObject.h renamed to DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/FT0CalibrationInfoObject.h Detectors/FIT/FT0/calibration/include/FT0Calibration/FT0CalibrationInfoObject.h renamed to DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/FT0CalibrationInfoObject.h

@@ -46,4 +46,4 @@ class FT0CalibrationInfoObject
 } // namespace ft0
 } // namespace o2
 
-#endif //O2_FT0CALIBRATIONINFOOBJECT_H
+#endif // O2_FT0CALIBRATIONINFOOBJECT_H

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

@@ -14,26 +14,19 @@
 
 #include <array>
 #include "Rtypes.h"
-#include "DataFormatsFT0/RawEventData.h"
+#include "FT0Base/Geometry.h"
 
 namespace o2::ft0
 {
 
 struct FT0ChannelTimeCalibrationObject {
 
-  std::array<int16_t, o2::ft0::Nchannels_FT0> mTimeOffsets{};
+  std::array<int16_t, o2::ft0::Geometry::Nchannels> mTimeOffsets{};
+  static constexpr const char* getObjectPath() { return "FT0/Calib/ChannelTimeOffset"; }
 
   ClassDefNV(FT0ChannelTimeCalibrationObject, 1);
 };
 
-class FT0ChannelTimeTimeSlotContainer;
-
-class FT0TimeChannelOffsetCalibrationObjectAlgorithm
-{
- public:
-  [[nodiscard]] static FT0ChannelTimeCalibrationObject generateCalibrationObject(const FT0ChannelTimeTimeSlotContainer& container);
-};
-
 } // namespace o2::ft0
 
-#endif //O2_FT0CHANNELTIMECALIBRATIONOBJECT_H
+#endif // O2_FT0CHANNELTIMECALIBRATIONOBJECT_H

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

@@ -22,6 +22,7 @@ namespace o2::ft0
 struct GlobalOffsetsCalibrationObject {
   // LHCphase calibration
   int mCollisionTimeOffsets; ///< <LHCphase>
+  static constexpr const char* getObjectPath() { return "FT0/Calib/GlobalOffsets"; }
   ClassDefNV(GlobalOffsetsCalibrationObject, 1);
 };
 
@@ -35,4 +36,4 @@ class GlobalOffsetsCalibrationObjectAlgorithm
 
 } // namespace o2::ft0
 
-#endif //O2_GLOBALOFFSETSCALIBRATIONOBJECT_H
+#endif // O2_GLOBALOFFSETSCALIBRATIONOBJECT_H

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

@@ -16,6 +16,7 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::ft0::Digit + ;
+#pragma link C++ class o2::ft0::DigitFilterParam + ;
 #pragma link C++ class o2::ft0::ChannelData + ;
 #pragma link C++ class o2::ft0::DetTrigInput + ;
 #pragma link C++ class o2::ft0::TriggersExt + ;
@@ -42,10 +43,9 @@
 #pragma link C++ class o2::ft0::CTF + ;
 #pragma link C++ class o2::ctf::EncodedBlocks < o2::ft0::CTFHeader, 9, uint32_t> + ;
 
+#pragma link C++ class o2::ft0::FT0CalibrationInfoObject + ;
+#pragma link C++ class o2::ft0::FT0ChannelTimeCalibrationObject + ;
 #pragma link C++ class o2::ft0::GlobalOffsetsCalibrationObject + ;
-#pragma link C++ class o2::ft0::GlobalOffsetsContainer + ;
 #pragma link C++ class o2::ft0::RecoCalibInfoObject + ;
 #pragma link C++ class o2::ft0::GlobalOffsetsInfoObject + ;
-#include "DetectorsCalibration/TimeSlotCalibration.h"
-#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::ft0::GlobalOffsetsInfoObject, o2::ft0::GlobalOffsetsContainer> + ;
 #endif

…/calibration/src/FITCalibrationLinkDef.h …tectors/FIT/FT0/src/DigitFilterParam.cxxDetectors/FIT/common/calibration/src/FITCalibrationLinkDef.h renamed to DataFormats/Detectors/FIT/FT0/src/DigitFilterParam.cxx Detectors/FIT/common/calibration/src/FITCalibrationLinkDef.h renamed to DataFormats/Detectors/FIT/FT0/src/DigitFilterParam.cxx

@@ -9,12 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifdef __CLING__
+#include "DataFormatsFT0/DigitFilterParam.h"
 
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::ft0::FT0CalibrationInfoObject, o2::ft0::FT0ChannelTimeTimeSlotContainer>;
-#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::fv0::FV0CalibrationInfoObject, o2::fv0::FV0ChannelTimeTimeSlotContainer>;
-#endif
+using namespace o2::ft0;
+O2ParamImpl(DigitFilterParam);

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

@@ -26,6 +26,8 @@ o2_add_library(DataFormatsFV0
 o2_target_root_dictionary(DataFormatsFV0
   HEADERS include/DataFormatsFV0/ChannelData.h
           include/DataFormatsFV0/Digit.h
+          include/DataFormatsFV0/FV0CalibrationInfoObject.h
+          include/DataFormatsFV0/FV0ChannelTimeCalibrationObject.h
           include/DataFormatsFV0/MCLabel.h
           include/DataFormatsFV0/Hit.h
           include/DataFormatsFV0/RecPoints.h

DataFormats/Detectors/FIT/FV0/CMakeLists.txt

@@ -46,4 +46,4 @@ class FV0CalibrationInfoObject
 } // namespace fv0
 } // namespace o2
 
-#endif //O2_FV0CALIBRATIONINFOOBJECT_H
+#endif // O2_FV0CALIBRATIONINFOOBJECT_H