Skip to content

Set TrackExtra001 as default #12087

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
mconcas merged 4 commits into from
Oct 27, 2023
Merged

Set TrackExtra001 as default #12087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7b3cd1
Set TrackExtra001 as default
fmazzasc Oct 22, 2023
b724072
Fix test
fmazzasc Oct 23, 2023
4e31bd5
Restore v001
fmazzasc Oct 23, 2023
06e6ec3
Minimal change of AnalysisDataModel
fmazzasc Oct 23, 2023
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
6 changes: 3 additions & 3 deletions Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void AODProducerWorkflowDPL::addToTracksExtraTable(TracksExtraCursorType& tracks
// extra
tracksExtraCursor(truncateFloatFraction(extraInfoHolder.tpcInnerParam, mTrack1Pt),
extraInfoHolder.flags,
extraInfoHolder.itsClusterMap,
extraInfoHolder.itsClusterSizes,
extraInfoHolder.tpcNClsFindable,
extraInfoHolder.tpcNClsFindableMinusFound,
extraInfoHolder.tpcNClsFindableMinusCrossedRows,
Expand Down Expand Up @@ -2370,14 +2370,14 @@ AODProducerWorkflowDPL::TrackExtraInfo AODProducerWorkflowDPL::processBarrelTrac
int nClusters = itsTrack.getNClusters();
float chi2 = itsTrack.getChi2();
extraInfoHolder.itsChi2NCl = nClusters != 0 ? chi2 / (float)nClusters : 0;
extraInfoHolder.itsClusterMap = itsTrack.getPattern();
extraInfoHolder.itsClusterSizes = itsTrack.getClusterSizes();
if (src == GIndex::ITS) { // standalone ITS track should set its time from the ROF
const auto& rof = data.getITSTracksROFRecords()[mITSROFs[trackIndex.getIndex()]];
double t = rof.getBCData().differenceInBC(mStartIR) * o2::constants::lhc::LHCBunchSpacingNS + mITSROFrameHalfLengthNS;
setTrackTime(t, mITSROFrameHalfLengthNS, false);
}
} else if (contributorsGID[GIndex::Source::ITSAB].isIndexSet()) { // this is an ITS-TPC afterburner contributor
extraInfoHolder.itsClusterMap = data.getITSABRefs()[contributorsGID[GIndex::Source::ITSAB].getIndex()].pattern;
extraInfoHolder.itsClusterSizes = data.getITSABRefs()[contributorsGID[GIndex::Source::ITSAB].getIndex()].getClusterSizes();
}
if (contributorsGID[GIndex::Source::TPC].isIndexSet()) {
const auto& tpcOrig = data.getTPCTrack(contributorsGID[GIndex::TPC]);
Expand Down
4 changes: 2 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 @@ -473,8 +473,8 @@ DECLARE_SOA_EXTENDED_TABLE(TracksExtra_000, StoredTracksExtra_000, "TRACKEXTRA",
DECLARE_SOA_EXTENDED_TABLE(TracksExtra_001, StoredTracksExtra_001, "TRACKEXTRA", //! Additional track information (clusters, PID, etc.)
track::v001::DetectorMap);

using StoredTracksExtra = StoredTracksExtra_000;
using TracksExtra = TracksExtra_000;
using StoredTracksExtra = StoredTracksExtra_001;
using TracksExtra = TracksExtra_001;

using Track = Tracks::iterator;
using TrackIU = TracksIU::iterator;
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_AnalysisTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ TEST_CASE("AdaptorCompilation")
REQUIRE(task2.inputs.size() == 10);
REQUIRE(task2.inputs[1].binding == "TracksExtension");
REQUIRE(task2.inputs[2].binding == "Tracks");
REQUIRE(task2.inputs[3].binding == "TracksExtra_000Extension");
REQUIRE(task2.inputs[3].binding == "TracksExtra_001Extension");
REQUIRE(task2.inputs[4].binding == "TracksExtra");
REQUIRE(task2.inputs[5].binding == "TracksCovExtension");
REQUIRE(task2.inputs[6].binding == "TracksCov");
Expand Down