AFIT-101: new extended trg word(min bias), update for FT0 time offset collibration (AliceO2Group#13514)

* FIT: new extended trg word(min bias), update for FT0 time offset functionality(for min bias usage)

* adding Detectectors common data format to FIT det data format

* turning off common digits for FT0 and FV0 for checking

* turning off common digits for FDD

* removing commented lines

---------

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

Author: afurs

DataFormats/Detectors/FIT/FDD/CMakeLists.txt

@@ -17,6 +17,7 @@ o2_add_library(DataFormatsFDD
                         O2::DataFormatsFIT
                         O2::SimulationDataFormat
                         O2::CommonDataFormat
+                        O2::DetectorsCommonDataFormats
 )
 
 o2_target_root_dictionary(DataFormatsFDD
@@ -28,3 +29,4 @@ o2_target_root_dictionary(DataFormatsFDD
           include/DataFormatsFDD/RawEventData.h
           include/DataFormatsFDD/LookUpTable.h
           include/DataFormatsFDD/CTF.h)
+

DataFormats/Detectors/FIT/FT0/CMakeLists.txt

@@ -26,6 +26,7 @@ o2_add_library(DataFormatsFT0
                         O2::CommonDataFormat
                         O2::Headers
                         O2::CCDB
+                        O2::DetectorsCommonDataFormats
 )
 
 o2_target_root_dictionary(DataFormatsFT0

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

@@ -13,8 +13,8 @@
 /// \brief Class to describe fired and stored channels for the BC and to refer to channel data
 /// \author Alla.Maevskaya@cern.ch
 
-#ifndef _FT0_CHANNELDATA_H_
-#define _FT0_CHANNELDATA_H_
+#ifndef O2_FT0_CHANNELDATA_H_
+#define O2_FT0_CHANNELDATA_H_
 
 #include <Rtypes.h>
 #include <tuple>

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

@@ -27,9 +27,9 @@ struct DigitFilterParam : o2::conf::ConfigurableParamHelper<DigitFilterParam> {
   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;
+  uint64_t mTrgBitsGood = Triggers::word(Triggers::bitVertex, Triggers::bitDataIsValid);
+  uint64_t mTrgBitsBad = Triggers::word(Triggers::bitOutputsAreBlocked);
+  uint64_t mTrgBitsToCheck = mTrgBitsGood | mTrgBitsBad;
 
   O2ParamDef(DigitFilterParam, "FT0DigitFilterParam");
 };
@@ -41,12 +41,13 @@ struct ChannelFilterParam : o2::conf::ConfigurableParamHelper<ChannelFilterParam
   int16_t mTimeLower = -2050;
 
   uint8_t mPMbitsGood = 0;
-  uint8_t mPMbitsBad = 0;                                                   // no checking for bad bits
+  uint8_t mPMbitsBad = 0; // no checking for bad bits
   uint8_t mPMbitsToCheck = mPMbitsGood | mPMbitsBad;
 
-  uint8_t mTrgBitsGood = 0;
-  uint8_t mTrgBitsBad = 0;                                // Laser haven't been used in 2022, no check for bad bits
-  uint8_t mTrgBitsToCheck = mTrgBitsGood | mTrgBitsBad;
+  uint64_t mTrgBitsGood = 0;
+  uint64_t mTrgBitsBad = 0; // Laser haven't been used in 2022, no check for bad bits
+  uint64_t mTrgBitsToCheck = mTrgBitsGood | mTrgBitsBad;
+
   bool checkPMbits(uint8_t pmBits) const
   {
     return (pmBits & mPMbitsToCheck) == mPMbitsGood;

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

@@ -55,4 +55,5 @@
 #pragma link C++ class o2::ft0::GlobalOffsetsInfoObject + ;
 #pragma link C++ class std::pair < std::vector < double>, std::vector < double>> + ;
 #pragma link C++ class o2::ft0::SlewingCoef + ;
+
 #endif

DataFormats/Detectors/FIT/FV0/CMakeLists.txt

@@ -22,6 +22,7 @@ o2_add_library(DataFormatsFV0
                         O2::SimulationDataFormat
                         O2::CommonDataFormat
                         Microsoft.GSL::GSL
+                        O2::DetectorsCommonDataFormats
 )
 
 o2_target_root_dictionary(DataFormatsFV0
@@ -34,5 +35,4 @@ o2_target_root_dictionary(DataFormatsFV0
           include/DataFormatsFV0/RecPoints.h
           include/DataFormatsFV0/RawEventData.h
           include/DataFormatsFV0/LookUpTable.h
-          include/DataFormatsFV0/CTF.h
-)
+          include/DataFormatsFV0/CTF.h)

DataFormats/Detectors/FIT/common/CMakeLists.txt

@@ -20,4 +20,6 @@ o2_add_library(DataFormatsFIT
 o2_target_root_dictionary(DataFormatsFIT
   HEADERS include/DataFormatsFIT/DCSDPValues.h
           include/DataFormatsFIT/LookUpTable.h
-          include/DataFormatsFIT/Triggers.h)
+          include/DataFormatsFIT/Triggers.h
+          include/DataFormatsFIT/ChannelData.h
+          include/DataFormatsFIT/Digit.h)

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/ChannelData.h

@@ -0,0 +1,70 @@
+// 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 ChannelData.h
+/// \brief Class represents enity with info per channel in given event
+/// \author Artur Furs afurs@cern.ch
+
+#ifndef _FT0_CHANNELDATA_H_
+#define _FT0_CHANNELDATA_H_
+
+#include <Rtypes.h>
+#include <map>
+#include <string>
+#include "DetectorsCommonDataFormats/DetID.h"
+
+namespace o2
+{
+namespace fit
+{
+
+template <o2::detectors::DetID::ID DetID>
+struct ChannelData {
+  static constexpr o2::detectors::DetID sDetID = o2::detectors::DetID(DetID);
+  static constexpr uint8_t sDUMMY_CHANNEL_ID = 0xff;
+  static constexpr uint8_t sDUMMY_PM_WORD = 0xff;
+  static constexpr int16_t sDUMMY_TIME = -5000;
+  static constexpr int16_t sDUMMY_AMP = -5000;
+  uint8_t mChannelID = sDUMMY_CHANNEL_ID; // channel id
+  uint8_t mWordPM = sDUMMY_PM_WORD;       // PM word, based on EBitsPM
+  int16_t mTime = sDUMMY_TIME;            // time in TDC units
+  int16_t mAmp = sDUMMY_AMP;              // amplitude in ADC units
+  enum EBitsPM {
+    kNumberADC,
+    kIsDoubleEvent,
+    kIsTimeInfoNotValid,
+    kIsCFDinADCgate,
+    kIsTimeInfoLate,
+    kIsAmpNotValid,
+    kIsVertexEvent,
+    kIsTimeInfoLost
+  };
+  static const inline std::map<unsigned int, std::string> sMapBitsPM = {
+    {EBitsPM::kNumberADC, "NumberADC"},
+    {EBitsPM::kIsDoubleEvent, "IsDoubleEvent"},
+    {EBitsPM::kIsTimeInfoNotValid, "IsTimeInfoNotValid"},
+    {EBitsPM::kIsCFDinADCgate, "IsCFDinADCgate"},
+    {EBitsPM::kIsTimeInfoLate, "IsTimeInfoLate"},
+    {EBitsPM::kIsAmpNotValid, "IsAmpNotValid"},
+    {EBitsPM::kIsVertexEvent, "IsVertexEvent"},
+    {EBitsPM::kIsTimeInfoLost, "IsTimeInfoLost"}};
+  ChannelData() = default;
+  ChannelData(uint8_t channelID, uint8_t wordPM, int16_t time, int16_t amp) : mChannelID(channelID), mWordPM(wordPM), mTime(time), mAmp(amp)
+  {
+  }
+  //  void print() const;
+  bool operator<=>(ChannelData const& other) const = default;
+  bool operator==(ChannelData const& other) const = default;
+  ClassDefNV(ChannelData, 1);
+};
+} // namespace fit
+} // namespace o2
+#endif

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/Digit.h

@@ -0,0 +1,79 @@
+// 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 Digit.h
+/// \brief FIT event entity
+/// \author Artur Furs afurs@cern.ch
+
+#ifndef O2_FIT_DIGIT_H_
+#define O2_FIT_DIGIT_H_
+
+#include "CommonDataFormat/InteractionRecord.h"
+#include "CommonDataFormat/RangeReference.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include "DataFormatsFIT/ChannelData.h"
+#include "DataFormatsFIT/Triggers.h"
+
+#include <gsl/span>
+#include <Rtypes.h>
+
+namespace o2
+{
+namespace fit
+{
+using Triggers = o2::fit::Triggers;
+
+template <o2::detectors::DetID::ID DetID>
+struct DigitBase {
+  static constexpr o2::detectors::DetID sDetID = o2::detectors::DetID(DetID);
+  typedef ChannelData<DetID> ChannelData_t; // related ChannelData entity
+  o2::InteractionRecord mIR{};              // Interaction record (orbit, bc)
+  o2::dataformats::RangeReference<int, int> mReference{};
+  DigitBase() = default;
+  DigitBase(int first, int nEntries, const o2::InteractionRecord& ir) : mIR(ir)
+  {
+    mReference.setFirstEntry(first);
+    mReference.setEntries(nEntries);
+  }
+  uint32_t getOrbit() const { return mIR.orbit; }
+  uint16_t getBC() const { return mIR.bc; }
+  const o2::InteractionRecord& getIntRecord() const { return mIR; };
+  gsl::span<const ChannelData_t> getBunchChannelData(const gsl::span<const ChannelData_t> channelData) const
+  {
+    return mReference.getEntries() ? gsl::span<const ChannelData_t>(&channelData[mReference.getFirstEntry()], mReference.getEntries()) : gsl::span<const ChannelData_t>();
+  }
+  ClassDefNV(DigitBase, 1);
+};
+
+template <o2::detectors::DetID::ID DetID>
+struct Digit : public DigitBase<DetID> {
+  uint8_t mTriggerWord{};
+  Digit() = default;
+  Digit(int first, int nEntries, const o2::InteractionRecord& ir, uint8_t trgWord) : DigitBase<DetID>(first, nEntries, ir), mTriggerWord(trgWord)
+  {
+  }
+  ClassDefNV(Digit, 1);
+};
+
+template <o2::detectors::DetID::ID DetID>
+struct DigitExt : public DigitBase<DetID> {
+  Triggers mTriggers{};
+  DigitExt() = default;
+  DigitExt(int first, int nEntries, const o2::InteractionRecord& ir, const Triggers& triggers) : DigitBase<DetID>(first, nEntries, ir), mTriggers(triggers)
+  {
+  }
+  ClassDefNV(DigitExt, 1);
+};
+
+} // namespace fit
+} // namespace o2
+
+#endif

DataFormats/Detectors/FIT/common/include/DataFormatsFIT/Triggers.h

@@ -25,10 +25,15 @@ namespace o2
 {
 namespace fit
 {
-
 class Triggers
 {
  public:
+  template <typename... TrgBits>
+  constexpr static uint64_t word(TrgBits&&... trgBits)
+  {
+    return ((1ull << std::forward<TrgBits>(trgBits)) | ...);
+  }
+
   enum { bitA = 0,
          bitC = 1,                           // alias of bitAOut (FT0/FDD)
          bitAOut = 1,                        // alias of bitC (FV0)
@@ -40,7 +45,8 @@ class Triggers
          bitAIn = 4,                         // alias of bitVertex (FV0)
          bitLaser = 5,                       // indicates the laser was triggered in this BC
          bitOutputsAreBlocked = 6,           // indicates that laser-induced pulses should arrive from detector to FEE in this BC (and trigger outputs are blocked)
-         bitDataIsValid = 7 };               // data is valid for processing
+         bitDataIsValid = 7,                 // data is valid for processing
+         bitMinBias = 8 };                   // extra calculated bit, vrt & (cern || semicent)
   static const int16_t DEFAULT_TIME = -5000; // for average of one side (A or C)
   static const int16_t DEFAULT_AMP = 0;
   static const int16_t DEFAULT_ZERO = 0;
@@ -56,6 +62,15 @@ class Triggers
     timeA = atimeA;
     timeC = atimeC;
   }
+  inline static bool checkMinBiasFT0(uint64_t trgWord)
+  {
+    return static_cast<bool>(trgWord & word(bitVertex)) && static_cast<bool>(trgWord & word(bitSCen, bitCen));
+  }
+  static uint64_t makeExtendedTrgWord(uint64_t trgWord)
+  {
+    return trgWord | (static_cast<uint64_t>(checkMinBiasFT0(trgWord)) << bitMinBias);
+  }
+
   bool getOrA() const { return (triggersignals & (1 << bitA)) != 0; }
   bool getOrC() const { return (triggersignals & (1 << bitC)) != 0; }               // only used by FT0/FDD (same bit as OrAOut in FV0)
   bool getOrAOut() const { return (triggersignals & (1 << bitAOut)) != 0; }         // only used by FV0 (same bit as OrC in FT0/FDD)
@@ -68,6 +83,8 @@ class Triggers
   bool getLaser() const { return (triggersignals & (1 << bitLaser)) != 0; }
   bool getOutputsAreBlocked() const { return (triggersignals & (1 << bitOutputsAreBlocked)) != 0; }
   bool getDataIsValid() const { return (triggersignals & (1 << bitDataIsValid)) != 0; }
+  bool getMinBiasFT0() const { return checkMinBiasFT0(static_cast<uint64_t>(triggersignals)); }
+  uint64_t getExtendedTrgWordFT0() const { return makeExtendedTrgWord(static_cast<uint64_t>(triggersignals)); }
 
   uint8_t getTriggersignals() const { return triggersignals; }
   uint8_t getNChanA() const { return nChanA; }