From f853b73724948887a61169a52267ff4dfd16fa8c Mon Sep 17 00:00:00 2001 From: Wiktor Pierozak Date: Thu, 30 Jul 2026 12:24:43 +0200 Subject: [PATCH 1/5] Implemented FDD reconstruction parameters and modified reconstruction code --- DataFormats/Detectors/FIT/FDD/CMakeLists.txt | 4 ++- .../include/DataFormatsFDD/RecoFilterParam.h | 27 +++++++++++++++++++ .../FIT/FDD/src/DataFormatsFDDLinkDef.h | 2 ++ .../Detectors/FIT/FDD/src/RecoFilterParam.cxx | 4 +++ .../FDD/reconstruction/src/Reconstructor.cxx | 3 ++- 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h create mode 100644 DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx diff --git a/DataFormats/Detectors/FIT/FDD/CMakeLists.txt b/DataFormats/Detectors/FIT/FDD/CMakeLists.txt index 140ba1165bff8..6d3e78cf389cd 100644 --- a/DataFormats/Detectors/FIT/FDD/CMakeLists.txt +++ b/DataFormats/Detectors/FIT/FDD/CMakeLists.txt @@ -14,6 +14,7 @@ o2_add_library(DataFormatsFDD src/RecPoint.cxx src/CTF.cxx src/LookUpTable.cxx + src/RecoFilterParam.cxx PUBLIC_LINK_LIBRARIES O2::FDDBase O2::DataFormatsFIT O2::SimulationDataFormat @@ -29,5 +30,6 @@ o2_target_root_dictionary(DataFormatsFDD include/DataFormatsFDD/RecPoint.h include/DataFormatsFDD/RawEventData.h include/DataFormatsFDD/LookUpTable.h - include/DataFormatsFDD/CTF.h) + include/DataFormatsFDD/CTF.h + include/DataFormatsFDD/RecoFilterParam.h) diff --git a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h new file mode 100644 index 0000000000000..c87c3e52146b5 --- /dev/null +++ b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h @@ -0,0 +1,27 @@ +// 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. + +#ifndef ALICEO2_FDD_DIGIT_FILTER_PARAM +#define ALICEO2_FDD_DIGIT_FILTER_PARAM + +#include "CommonUtils/ConfigurableParamHelper.h" + +namespace o2::fdd { +struct RecoChargeFilter: o2::conf::ConfigurableParamHelper +{ + double AmplitudeCutOnCollisionTimeWeights = 3; + inline bool isAboveAmplitudeCut(double charge) const { + return charge > AmplitudeCutOnCollisionTimeWeights; + } + O2ParamDef(RecoChargeFilter, "FDDRecoChargeFilter"); +}; +} +#endif \ No newline at end of file diff --git a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h index daf1fb4027dc9..70b8e89b47a44 100644 --- a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h +++ b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h @@ -37,4 +37,6 @@ #pragma link C++ class o2::fdd::CTF + ; #pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ; +#pragma link C++ class o2::fdd::RecoChargeFilter + ; + #endif diff --git a/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx b/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx new file mode 100644 index 0000000000000..d8500e0056b18 --- /dev/null +++ b/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx @@ -0,0 +1,4 @@ +#include + +using namespace o2::fdd; +O2ParamImpl(RecoChargeFilter); \ No newline at end of file diff --git a/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx b/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx index 7d133e30df08e..1f74c1c59115e 100644 --- a/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx +++ b/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx @@ -17,6 +17,7 @@ #include "FDDBase/Constants.h" #include #include +#include #include using namespace o2::fdd; @@ -53,7 +54,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span 3) { + if (RecoChargeFilter::Instance().isAboveAmplitudeCut(adc)) { timeErr = 1. / adc; } if ((int)inChData[ich].mPMNumber < 8) { From 693e149ae6a0167d642d9f91435c6383f4a59e4d Mon Sep 17 00:00:00 2001 From: Wiktor Pierozak Date: Thu, 13 Aug 2026 08:44:50 +0200 Subject: [PATCH 2/5] Renamed FDD reco param strucutre --- DataFormats/Detectors/FIT/FDD/CMakeLists.txt | 4 ++-- .../DataFormatsFDD/{RecoFilterParam.h => FDDRecoConfig.h} | 7 ++----- DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h | 2 +- DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx | 4 ++++ DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx | 4 ---- Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx | 4 ++-- 6 files changed, 11 insertions(+), 14 deletions(-) rename DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/{RecoFilterParam.h => FDDRecoConfig.h} (74%) create mode 100644 DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx delete mode 100644 DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx diff --git a/DataFormats/Detectors/FIT/FDD/CMakeLists.txt b/DataFormats/Detectors/FIT/FDD/CMakeLists.txt index 6d3e78cf389cd..d05982780eadf 100644 --- a/DataFormats/Detectors/FIT/FDD/CMakeLists.txt +++ b/DataFormats/Detectors/FIT/FDD/CMakeLists.txt @@ -14,7 +14,7 @@ o2_add_library(DataFormatsFDD src/RecPoint.cxx src/CTF.cxx src/LookUpTable.cxx - src/RecoFilterParam.cxx + src/FDDRecoConfig.cxx PUBLIC_LINK_LIBRARIES O2::FDDBase O2::DataFormatsFIT O2::SimulationDataFormat @@ -31,5 +31,5 @@ o2_target_root_dictionary(DataFormatsFDD include/DataFormatsFDD/RawEventData.h include/DataFormatsFDD/LookUpTable.h include/DataFormatsFDD/CTF.h - include/DataFormatsFDD/RecoFilterParam.h) + include/DataFormatsFDD/FDDRecoConfig.h) diff --git a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h similarity index 74% rename from DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h rename to DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h index c87c3e52146b5..8db1d5b83615b 100644 --- a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RecoFilterParam.h +++ b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h @@ -15,13 +15,10 @@ #include "CommonUtils/ConfigurableParamHelper.h" namespace o2::fdd { -struct RecoChargeFilter: o2::conf::ConfigurableParamHelper +struct FDDRecoConfig: o2::conf::ConfigurableParamHelper { double AmplitudeCutOnCollisionTimeWeights = 3; - inline bool isAboveAmplitudeCut(double charge) const { - return charge > AmplitudeCutOnCollisionTimeWeights; - } - O2ParamDef(RecoChargeFilter, "FDDRecoChargeFilter"); + O2ParamDef(FDDRecoConfig, "FDDRecoConfig"); }; } #endif \ No newline at end of file diff --git a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h index 70b8e89b47a44..6dba28aa7ff0b 100644 --- a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h +++ b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h @@ -37,6 +37,6 @@ #pragma link C++ class o2::fdd::CTF + ; #pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ; -#pragma link C++ class o2::fdd::RecoChargeFilter + ; +#pragma link C++ struct o2::fdd::FDDRecoConfig + ; #endif diff --git a/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx new file mode 100644 index 0000000000000..bf06c96067d36 --- /dev/null +++ b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx @@ -0,0 +1,4 @@ +#include + +using namespace o2::fdd; +O2ParamImpl(FDDRecoConfig); \ No newline at end of file diff --git a/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx b/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx deleted file mode 100644 index d8500e0056b18..0000000000000 --- a/DataFormats/Detectors/FIT/FDD/src/RecoFilterParam.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#include - -using namespace o2::fdd; -O2ParamImpl(RecoChargeFilter); \ No newline at end of file diff --git a/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx b/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx index 1f74c1c59115e..10d27ca1a5da0 100644 --- a/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx +++ b/Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx @@ -17,7 +17,7 @@ #include "FDDBase/Constants.h" #include #include -#include +#include #include using namespace o2::fdd; @@ -54,7 +54,7 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span FDDRecoConfig::Instance().AmplitudeCutOnCollisionTimeWeights) { timeErr = 1. / adc; } if ((int)inChData[ich].mPMNumber < 8) { From 9a6fc58674ebde225572f9465cf105d9cdcf8f1a Mon Sep 17 00:00:00 2001 From: Wiktor Pierozak Date: Fri, 14 Aug 2026 16:09:15 +0200 Subject: [PATCH 3/5] Updated LinkDef --- DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h index 6dba28aa7ff0b..9d6174cfdb48e 100644 --- a/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h +++ b/DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h @@ -38,5 +38,5 @@ #pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ; #pragma link C++ struct o2::fdd::FDDRecoConfig + ; - +#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::fdd::FDDRecoConfig> + ; #endif From 1ba2f8272dceafe9f0c8c8e0cbf41d1894308529 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 14 Aug 2026 14:12:23 +0000 Subject: [PATCH 4/5] Please consider the following formatting changes --- .../FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h | 10 +++++----- DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h index 8db1d5b83615b..fc7a6416a31df 100644 --- a/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h +++ b/DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h @@ -14,11 +14,11 @@ #include "CommonUtils/ConfigurableParamHelper.h" -namespace o2::fdd { -struct FDDRecoConfig: o2::conf::ConfigurableParamHelper +namespace o2::fdd { - double AmplitudeCutOnCollisionTimeWeights = 3; - O2ParamDef(FDDRecoConfig, "FDDRecoConfig"); +struct FDDRecoConfig : o2::conf::ConfigurableParamHelper { + double AmplitudeCutOnCollisionTimeWeights = 3; + O2ParamDef(FDDRecoConfig, "FDDRecoConfig"); }; -} +} // namespace o2::fdd #endif \ No newline at end of file diff --git a/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx index bf06c96067d36..390fe0440fbe9 100644 --- a/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx +++ b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace o2::fdd; O2ParamImpl(FDDRecoConfig); \ No newline at end of file From 474e4cdb9918a487faaf0e92345fc04388d52fde Mon Sep 17 00:00:00 2001 From: Wiktor Pierozak Date: Fri, 14 Aug 2026 16:15:06 +0200 Subject: [PATCH 5/5] Added copyright header to FDDRecoConfig.cxx --- DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx index 390fe0440fbe9..4b017368416b6 100644 --- a/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx +++ b/DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx @@ -1,3 +1,14 @@ +// 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. + #include using namespace o2::fdd;