Skip to content

[FIT] Align dataformats, names and formatting of FV0 to match FT0 #8344

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

Merged
shahor02 merged 15 commits into from
Mar 23, 2022
Merged

[FIT] Align dataformats, names and formatting of FV0 to match FT0 #8344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a6f1186
[FV0] Make ChannelData format similar to that of FT0
Jan 19, 2022
56e4a53
[FV0] LUT quick-fix from Artur
Jan 19, 2022
6b3b92b
[FV0] Rename 'BCData' to 'Digit'
Jan 19, 2022
9dcaebd
[FV0] Remove obsolete and unused ReadRaw() class / macro
Jan 20, 2022
44a6708
[FV0] Remove Digits2Raw and cleanup of LookUpTable (remove LookUpTabl…
Jan 20, 2022
20062e3
[FV0] Cleanup unused includes in FV0 DataFormats and in sim+reco & cl…
Jan 20, 2022
1a01f08
[FT0] Rename DigitizationParameters -> FT0DigParam
Jan 21, 2022
00597e1
[FT0] Cleanup: removed obsolete LookUpTable, DigitsTemp, unused ReadR…
Jan 21, 2022
e133f5f
[FV0] Make digits code and structure similar to FT0
Feb 3, 2022
bbd9815
[FT0] Fixes after rebasing to include new FT0 changes
Feb 21, 2022
4a40a7c
[FT0] Remove comments in 'raw' & remove unused DigitizerTask
Mar 1, 2022
a662ed8
[FIT] Align FT0 and FV0 simulation and macros
Mar 1, 2022
14baecf
[FIT] Align FT0 and FV0 workflow, sim and reco
Mar 7, 2022
d60896a
[FIT] Align FT0 and FV0 data formats & remove obsolete TODO
Mar 7, 2022
05a7975
[FIT] Fix CI errors.
Mar 13, 2022
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
2 changes: 0 additions & 2 deletions DataFormats/Detectors/FIT/FT0/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

o2_add_library(DataFormatsFT0
SOURCES src/Digit.cxx
SOURCES src/DigitsTemp.cxx
SOURCES src/ChannelData.cxx
SOURCES src/RecPoints.cxx
SOURCES src/RawEventData.cxx
Expand All @@ -29,7 +28,6 @@ o2_add_library(DataFormatsFT0

o2_target_root_dictionary(DataFormatsFT0
HEADERS include/DataFormatsFT0/Digit.h
include/DataFormatsFT0/DigitsTemp.h
include/DataFormatsFT0/ChannelData.h
include/DataFormatsFT0/RecPoints.h
include/DataFormatsFT0/MCLabel.h
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/ChannelData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct ChannelData {

bool operator==(ChannelData const& other) const
{
return std::tie(ChId, CFDTime, QTCAmpl) == std::tie(other.ChId, other.CFDTime, other.QTCAmpl);
return std::tie(ChId, CFDTime, QTCAmpl, ChainQTC) == std::tie(other.ChId, other.CFDTime, other.QTCAmpl, other.ChainQTC);
}
ClassDefNV(ChannelData, 4);
};
Expand Down
100 changes: 0 additions & 100 deletions DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/DigitsTemp.h
View file
Open in desktop

This file was deleted.

Loading