Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
93263cb
Created configuration structures for Channels, Tcm and Pm data
Aug 5, 2026
734c2be
Cleaned detector_config::Channels structure
Aug 5, 2026
cf7aa81
Created FEE configuration data types for subdetectors
Aug 5, 2026
7b1adf6
Renamed DataFormatsFIT/FeeConfiguration.h to DataFormatsFIT/Configura…
Aug 5, 2026
2f84eea
preparing structure for configuration parsing
Aug 5, 2026
2174edf
Updated DCS code for FT0
Aug 5, 2026
7152c6e
fixed compilation issues
Aug 6, 2026
1575a23
Created config processors for subdetctors
Aug 6, 2026
967fe04
Moved FT0DCSConfigProcessor to seperate file
Aug 6, 2026
ee61e3d
Moved FV0 and FDD config processor classes to dedicated headers and s…
Aug 7, 2026
3142db3
Created FT0FeeConfigurationReader class
Aug 7, 2026
9323b44
Created schema validation for FEE configuration
Aug 7, 2026
d173b88
Created base class for DCS configuration readers, wired FEE configura…
Aug 7, 2026
abd01f2
Refactored FITFEEConfigurationReader for better code reusability
Aug 7, 2026
4ce8011
Implemented basic unit tests for FITFEEConfigurationReader
Aug 10, 2026
f1efb89
Fixed FEE configuration serialization issue
Aug 10, 2026
a1a512a
Created HvConfigurationReader and refactor DCSMonitoring classes
Aug 11, 2026
ccef6c4
Created unit tests for FITHvConfigurationReader and fixed runtime iss…
Aug 11, 2026
201810c
Included configuration parsing in FV0 config processor; Changed numbe…
Aug 11, 2026
02737d6
Created configuration data types for FDD
Aug 11, 2026
355d969
Updated FDD config processor to include configuration parsing; fixed …
Aug 12, 2026
581a9f2
Fixed error handling in FDD and FV0 to preven abort on exception
Aug 12, 2026
2d2eb2d
Created scripts to fetch FEE configuration
Aug 12, 2026
d054cc4
Changed configuration filenames, renamed FITDCSConfigProcessorSpec.h …
Aug 31, 2026
5ce8687
Added side_combination_mode to configuration structure
Oct 2, 2026
34e7cab
Added fdd coincidence mode and threshold calibration to FIT configura…
Oct 2, 2026
159c731
Please consider the following formatting changes
alibuild Oct 2, 2026
347489f
Merge pull request #11 from alibuild/alibot-cleanup-15888
wpierozak Oct 2, 2026
9cdce47
Added missing copyrights
Oct 2, 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
4 changes: 3 additions & 1 deletion DataFormats/Detectors/FIT/FDD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ 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/FeeConfiguration.h
include/DataFormatsFDD/HvConfiguration.h)

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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 O2_FDD_FEE_CONFIGURATION
#define O2_FDD_FEE_CONFIGURATION

#include "DataFormatsFIT/Configuration.h"

namespace o2::fdd
{
struct TriggersConfig {
float vertexTimeLowThreshold{o2::fit::config_helpers::DefaultValue};
float vertexTimeHighThreshold{o2::fit::config_helpers::DefaultValue};
uint16_t semicentralA{o2::fit::config_helpers::DefaultValue};
uint16_t semicentralC{o2::fit::config_helpers::DefaultValue};
uint16_t centralA{o2::fit::config_helpers::DefaultValue};
uint16_t centralC{o2::fit::config_helpers::DefaultValue};
uint8_t sidesCombinationMode{o2::fit::config_helpers::DefaultValue};

ClassDefNV(TriggersConfig, 1);
};

struct FddFeeConfiguration {
static constexpr int NChannels = 16;
TriggersConfig triggers;
o2::fit::ChannelsConfig<NChannels> channels;
o2::fit::TcmConfig tcm;
o2::fit::PmConfig pmA[10];
o2::fit::PmConfig pmC[10];

ClassDefNV(FddFeeConfiguration, 1);
};
} // namespace o2::fdd
#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// 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 O2_FDD_HV_CONFIGURATION
#define O2_FDD_HV_CONFIGURATION

#include "DataFormatsFIT/Configuration.h"
#include <Rtypes.h>

namespace o2::fdd
{
struct FddHvConfiguration {
static constexpr int NChannels = 16;
o2::fit::HvChannelsConfig<NChannels> channels;
ClassDefNV(FddHvConfiguration, 1);
};
} // namespace o2::fdd
#endif
5 changes: 5 additions & 0 deletions DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,9 @@
#pragma link C++ class o2::fdd::CTF + ;
#pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ;

#pragma link C++ struct o2::fdd::FddFeeConfiguration + ;
#pragma link C++ struct o2::fit::ChannelsConfig < 16> + ;
#pragma link C++ struct o2::fdd::TriggersConfig + ;
#pragma link C++ struct o2::fdd::FddHvConfiguration + ;
#pragma link C++ struct o2::fit::HvChannelsConfig < 16> + ;
#endif
2 changes: 2 additions & 0 deletions DataFormats/Detectors/FIT/FT0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,6 @@ o2_target_root_dictionary(DataFormatsFT0
include/DataFormatsFT0/SpectraInfoObject.h
include/DataFormatsFT0/SlewingCoef.h
include/DataFormatsFT0/EventsPerBc.h
include/DataFormatsFT0/FeeConfiguration.h
include/DataFormatsFT0/HvConfiguration.h
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// 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 O2_FT0_FEE_CONFIGURATION
#define O2_FT0_FEE_CONFIGURATION

#include "CommonUtils/ConfigurableParamHelper.h"
#include "DataFormatsFIT/Configuration.h"
#include <Rtypes.h>

namespace o2::ft0
{
struct TriggersConfig {
int16_t vertexTimeLowThreshold{o2::fit::config_helpers::DefaultValue};
int16_t vertexTimeHighThreshold{o2::fit::config_helpers::DefaultValue};
uint16_t semicentralA{o2::fit::config_helpers::DefaultValue};
uint16_t semicentralC{o2::fit::config_helpers::DefaultValue};
uint16_t centralA{o2::fit::config_helpers::DefaultValue};
uint16_t centralC{o2::fit::config_helpers::DefaultValue};
uint8_t sidesCombinationMode{o2::fit::config_helpers::DefaultValue};
ClassDefNV(TriggersConfig, 1);
};

struct Ft0FeeConfiguration {
static constexpr int NChannels = 208;
TriggersConfig triggers;
o2::fit::ChannelsConfig<NChannels> channels;
o2::fit::TcmConfig tcm;
o2::fit::PmConfig pmA[10];
o2::fit::PmConfig pmC[10];
ClassDefNV(Ft0FeeConfiguration, 1);
};
} // namespace o2::ft0
#endif
Original file line number Diff line number Diff line change
@@ -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 O2_FT0_HV_CONFIGURATION
#define O2_FT0_HV_CONFIGURATION

#include "CommonUtils/ConfigurableParamHelper.h"
#include "DataFormatsFIT/Configuration.h"
#include <Rtypes.h>

namespace o2::ft0
{
struct Ft0HvConfiguration {
static constexpr int NChannels = 208;
o2::fit::HvChannelsConfig<NChannels> channels;
ClassDefNV(Ft0HvConfiguration, 1);
};
} // namespace o2::ft0
#endif
6 changes: 5 additions & 1 deletion DataFormats/Detectors/FIT/FT0/src/DataFormatsFT0LinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,9 @@
#pragma link C++ class o2::ft0::SlewingCoef + ;

#pragma link C++ class o2::ft0::EventsPerBc + ;

#pragma link C++ struct o2::ft0::Ft0FeeConfiguration + ;
#pragma link C++ struct o2::ft0::TriggersConfig + ;
#pragma link C++ struct o2::fit::ChannelsConfig < 208> + ;
#pragma link C++ struct o2::ft0::Ft0HvConfiguration + ;
#pragma link C++ struct o2::fit::HvChannelsConfig < 208> + ;
#endif
4 changes: 3 additions & 1 deletion DataFormats/Detectors/FIT/FV0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,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/FeeConfiguration.h
include/DataFormatsFV0/HvConfiguration.h)
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// 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 O2_FV0_FEE_CONFIGURATION
#define O2_FV0_FEE_CONFIGURATION

#include "DataFormatsFIT/Configuration.h"

namespace o2::fv0
{
struct TriggersConfig {
uint16_t nChannels{o2::fit::config_helpers::DefaultValue};
uint16_t innerRings{o2::fit::config_helpers::DefaultValue};
uint16_t charge{o2::fit::config_helpers::DefaultValue};
uint16_t outerRings{o2::fit::config_helpers::DefaultValue};
uint8_t sidesCombinationMode{o2::fit::config_helpers::DefaultValue};

ClassDefNV(TriggersConfig, 1);
};

struct Fv0FeeConfiguration {
static constexpr int NChannels = 48;
TriggersConfig triggers;
o2::fit::ChannelsConfig<NChannels> channels;
o2::fit::TcmConfig tcm;
o2::fit::PmConfig pmA[10];

ClassDefNV(Fv0FeeConfiguration, 1);
};
} // namespace o2::fv0
#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// 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 O2_FV0_HV_CONFIGURATION
#define O2_FV0_HV_CONFIGURATION

#include "DataFormatsFIT/Configuration.h"
#include <Rtypes.h>

namespace o2::fv0
{
struct Fv0HvConfiguration {
static constexpr int NChannels = 48;
o2::fit::HvChannelsConfig<NChannels> channels;
ClassDefNV(Fv0HvConfiguration, 1);
};
} // namespace o2::fv0
#endif
4 changes: 4 additions & 0 deletions DataFormats/Detectors/FIT/FV0/src/DataFormatsFV0LinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,8 @@
#pragma link C++ class o2::fv0::FV0CalibrationInfoObject + ;
#pragma link C++ class o2::fv0::FV0ChannelTimeCalibrationObject + ;

#pragma link C++ struct o2::fv0::Fv0FeeConfiguration + ;
#pragma link C++ struct o2::fit::ChannelsConfig < 48> + ;
#pragma link C++ struct o2::fv0::Fv0HvConfiguration + ;
#pragma link C++ struct o2::fit::HvChannelsConfig < 48> + ;
#endif
4 changes: 3 additions & 1 deletion DataFormats/Detectors/FIT/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ o2_target_root_dictionary(DataFormatsFIT
include/DataFormatsFIT/LookUpTable.h
include/DataFormatsFIT/Triggers.h
include/DataFormatsFIT/ChannelData.h
include/DataFormatsFIT/Digit.h)
include/DataFormatsFIT/Digit.h
include/DataFormatsFIT/Configuration.h
include/DataFormatsFIT/DeadChannelMap.h)
Loading
Loading