Skip to content

Bump trackextra table to the latest version #13785

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
pzhristov merged 2 commits into from
Dec 12, 2024
Merged

Bump trackextra table to the latest version #13785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fc40e6
Bump trackextra table to the latest version
maciacco Dec 9, 2024
77a35ae
update table version in test
maciacco Dec 9, 2024
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: 1 addition & 1 deletion Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ void AODProducerWorkflowDPL::addToTracksExtraTable(TracksExtraCursorType& tracks
extraInfoHolder.itsClusterSizes,
extraInfoHolder.tpcNClsFindable,
extraInfoHolder.tpcNClsFindableMinusFound,
// extraInfoHolder.tpcNClsFindableMinusPID,
extraInfoHolder.tpcNClsFindableMinusPID,
extraInfoHolder.tpcNClsFindableMinusCrossedRows,
extraInfoHolder.tpcNClsShared,
extraInfoHolder.trdPattern,
Expand Down
6 changes: 4 additions & 2 deletions Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,8 @@ DECLARE_SOA_EXTENDED_TABLE(TracksExtra_002, StoredTracksExtra_002, "EXTRACKEXTRA
DECLARE_SOA_TABLE(Run2TrackExtras, "AOD", "RUN2TRACKEXTRA",
track::ITSSignal);

using StoredTracksExtra = StoredTracksExtra_001;
using TracksExtra = TracksExtra_001;
using StoredTracksExtra = StoredTracksExtra_002;
using TracksExtra = TracksExtra_002;

using Track = Tracks::iterator;
using TrackIU = TracksIU::iterator;
Expand Down Expand Up @@ -1849,6 +1849,8 @@ DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/0");
DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/1");
DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/1");
DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/0", "TRACKEXTRA/1");
DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/0", "TRACKEXTRA/2");
DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/1", "TRACKEXTRA/2");
DECLARE_EQUIVALENT_FOR_INDEX_NG("HMPID/0", "HMPID/1");
DECLARE_EQUIVALENT_FOR_INDEX_NG("MFTTracks/0", "MFTTracks/1");
} // namespace soa
Expand Down
2 changes: 2 additions & 0 deletions Framework/Core/src/AODReaderHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(std::vector<InputSpec>& reque
outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/0"_h>>());
} else if (version == 1U) {
outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/1"_h>>());
} else if (version == 2U) {
outputs.adopt(Output{origin, description, version}, maker.template operator()<o2::aod::Hash<"EXTRACKEXTRA/2"_h>>());
}
} else if (description == header::DataDescription{"EXMFTTRACK"}) {
if (version == 0U) {
Expand Down
Loading