Skip to content

AFIT-80 - Implementation of configurable parameters for FV0 reconstruction #15676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wpierozak wants to merge 7 commits into
base: dev
Choose a base branch
from
+61 −5
Open

AFIT-80 - Implementation of configurable parameters for FV0 reconstruction #15676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8027826
created fv0::TimeFilter and fv0::ChargeFilter classes for reco config…
Jul 21, 2026
1c13b43
replaced Digit configuration opitons with ChargeFilter and TimeFilter…
Jul 21, 2026
084748c
clang-format
Jul 21, 2026
21b8265
prefixed FV0 reco configuration structure with 'FV0Reco'
Aug 3, 2026
4a654e8
Merged Charge and Time fileters to one Fv0RecoConfig
Aug 5, 2026
c50cc47
Renamed files
Aug 5, 2026
209dc51
Fixed typo in FV0 CMakeLists
Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion DataFormats/Detectors/FIT/FV0/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ o2_add_library(DataFormatsFV0
src/RawEventData.cxx
src/CTF.cxx
src/LookUpTable.cxx
src/FV0RecoConfig.cxx
PUBLIC_LINK_LIBRARIES O2::FV0Base
O2::DataFormatsFIT
O2::SimulationDataFormat
Expand All @@ -35,4 +36,6 @@ 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
include/DataFormatsFV0/FV0RecoConfig.h
)
36 changes: 36 additions & 0 deletions DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/FV0RecoConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// 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_FV0_DIGIT_FILTER_PARAM
#define ALICEO2_FV0_DIGIT_FILTER_PARAM

#include "CommonUtils/ConfigurableParamHelper.h"
#include "DataFormatsFV0/ChannelData.h"

namespace o2::fv0
{
struct FV0RecoConfig : o2::conf::ConfigurableParamHelper<FV0RecoConfig> {
double AmplitudeLowerThreshold = 24; // only channels with amplitude higher will participate in calibration and collision time
double AmplitudeThreholdForMeanTime = 5; // Charge threshold, only above which the time is taken into account in calculating the mean time of all qualifying channels
double TimeUpperThershold = 1000.0; // only channels with time below will participate in calibration and collision time
uint8_t mValidPmInputFlagMask = ~(1u << ChannelData::kNumberADC);
uint8_t mValidPmInputFlags = static_cast<uint8_t>((1u << ChannelData::kIsCFDinADCgate) | (1u << ChannelData::kIsEventInTVDC));

bool areChannelDataFlagsGood(uint8_t flags) const
{
return (flags & mValidPmInputFlagMask) == mValidPmInputFlags;
}
O2ParamDef(FV0RecoConfig, "FV0RecoConfig");
};

} // namespace o2::fv0

#endif
1 change: 1 addition & 0 deletions DataFormats/Detectors/FIT/FV0/src/DataFormatsFV0LinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@
#pragma link C++ class o2::fv0::FV0CalibrationInfoObject + ;
#pragma link C++ class o2::fv0::FV0ChannelTimeCalibrationObject + ;

#pragma link C++ class o2::fv0::FV0RecoConfig + ;

@f3sch f3sch Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might also be needed.

Suggested change
#pragma link C++ class o2::fv0::FV0RecoConfig + ;
#pragma link C++ class o2::fv0::FV0RecoConfig + ;
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::fv0::FV0RecoConfig> + ;

#endif
15 changes: 15 additions & 0 deletions DataFormats/Detectors/FIT/FV0/src/FV0RecoConfig.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// 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 "DataFormatsFV0/FV0RecoConfig.h"

using namespace o2::fv0;
O2ParamImpl(FV0RecoConfig);
9 changes: 5 additions & 4 deletions Detectors/FIT/FV0/reconstruction/src/BaseRecoTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "FV0Base/Geometry.h"
#include "FV0Simulation/FV0DigParam.h"
#include "FV0Simulation/DigitizationConstant.h"
#include "DataFormatsFV0/FV0RecoConfig.h"
#include <DataFormatsFV0/ChannelData.h>
#include <DataFormatsFV0/Digit.h>
#include <CommonDataFormat/InteractionRecord.h>
Expand Down Expand Up @@ -56,14 +57,14 @@ RP BaseRecoTask::process(o2::fv0::Digit const& bcd,
const auto& currentOutCh = outChData.back();

// Conditions for reconstructing collision time (3 variants: first, average-relaxed and average-tight)
if (currentOutCh.charge > FV0DigParam::Instance().chargeThrForMeanTime) {
if (currentOutCh.charge > FV0RecoConfig::Instance().AmplitudeThreholdForMeanTime) {
sideAtimeFirst = std::min(static_cast<Double_t>(sideAtimeFirst), currentOutCh.time);
if (inChData[ich].areAllFlagsGood()) {
if (std::abs(currentOutCh.time) < FV0DigParam::Instance().mTimeThresholdForReco) {
if (FV0RecoConfig::Instance().areChannelDataFlagsGood(inChData[ich].ChainQTC)) {
if (std::abs(currentOutCh.time) < FV0RecoConfig::Instance().TimeUpperThershold) {
sideAtimeAvg += currentOutCh.time;
ndigitsA++;
}
if (currentOutCh.charge > FV0DigParam::Instance().mAmpThresholdForReco && std::abs(currentOutCh.time) < FV0DigParam::Instance().mTimeThresholdForReco) {
if (currentOutCh.charge > FV0RecoConfig::Instance().AmplitudeLowerThreshold && std::abs(currentOutCh.time) < FV0RecoConfig::Instance().TimeUpperThershold) {
sideAtimeAvgSelected += currentOutCh.time;
ndigitsASelected++;
}
Expand Down