Repository navigation
AFIT-11 - Implementation of FEE configuration object #15888
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.
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
Draft
wpierozak
wants to merge
29
commits into
AliceO2Group:dev
Choose a base branch
from
wpierozak:AFIT-11
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,914
−306
Draft
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
734c2be
Cleaned detector_config::Channels structure
cf7aa81
Created FEE configuration data types for subdetectors
7b1adf6
Renamed DataFormatsFIT/FeeConfiguration.h to DataFormatsFIT/Configura…
2f84eea
preparing structure for configuration parsing
2174edf
Updated DCS code for FT0
7152c6e
fixed compilation issues
1575a23
Created config processors for subdetctors
967fe04
Moved FT0DCSConfigProcessor to seperate file
ee61e3d
Moved FV0 and FDD config processor classes to dedicated headers and s…
3142db3
Created FT0FeeConfigurationReader class
9323b44
Created schema validation for FEE configuration
d173b88
Created base class for DCS configuration readers, wired FEE configura…
abd01f2
Refactored FITFEEConfigurationReader for better code reusability
4ce8011
Implemented basic unit tests for FITFEEConfigurationReader
f1efb89
Fixed FEE configuration serialization issue
a1a512a
Created HvConfigurationReader and refactor DCSMonitoring classes
ccef6c4
Created unit tests for FITHvConfigurationReader and fixed runtime iss…
201810c
Included configuration parsing in FV0 config processor; Changed numbe…
02737d6
Created configuration data types for FDD
355d969
Updated FDD config processor to include configuration parsing; fixed …
581a9f2
Fixed error handling in FDD and FV0 to preven abort on exception
2d2eb2d
Created scripts to fetch FEE configuration
d054cc4
Changed configuration filenames, renamed FITDCSConfigProcessorSpec.h …
5ce8687
Added side_combination_mode to configuration structure
34e7cab
Added fdd coincidence mode and threshold calibration to FIT configura…
159c731
Please consider the following formatting changes
alibuild 347489f
Merge pull request #11 from alibuild/alibot-cleanup-15888
wpierozak 9cdce47
Added missing copyrights
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FeeConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
26 changes: 26 additions & 0 deletions
26
DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/HvConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/FeeConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
27 changes: 27 additions & 0 deletions
27
DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/HvConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/FeeConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
26 changes: 26 additions & 0 deletions
26
DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/HvConfiguration.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we keep this array of 10 or make it 12 ?
It is your choice, because probably we will not use all 12 channels ever..
But I was thinking if, just in case, there are some tests later then we can have a matching size of array with the no. of PM channels.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would you make it 12? There are at most 10 PM modules per side