From 9cb84d40f744133ab26a9a6e80089b19f28928d9 Mon Sep 17 00:00:00 2001 From: Jan Fiete Date: Sat, 8 Oct 2022 04:45:49 +0200 Subject: [PATCH 1/3] Distinguish between propagated and not propagated tracks --- Detectors/AOD/src/AODProducerWorkflowSpec.cxx | 2 +- Framework/Core/include/Framework/DataTypes.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Detectors/AOD/src/AODProducerWorkflowSpec.cxx b/Detectors/AOD/src/AODProducerWorkflowSpec.cxx index 949711a61e471..8bbb2f7340c27 100644 --- a/Detectors/AOD/src/AODProducerWorkflowSpec.cxx +++ b/Detectors/AOD/src/AODProducerWorkflowSpec.cxx @@ -258,7 +258,7 @@ void AODProducerWorkflowDPL::addToTracksTable(TracksCursorType& tracksCursor, Tr { tracksCursor(0, collisionID, - o2::aod::track::Track, + o2::aod::track::TrackIU, truncateFloatFraction(track.getX(), mTrackX), truncateFloatFraction(track.getAlpha(), mTrackAlpha), track.getY(), diff --git a/Framework/Core/include/Framework/DataTypes.h b/Framework/Core/include/Framework/DataTypes.h index ce570d83e38fb..11990c1796b2b 100644 --- a/Framework/Core/include/Framework/DataTypes.h +++ b/Framework/Core/include/Framework/DataTypes.h @@ -28,7 +28,8 @@ enum CollisionFlagsRun2 : uint16_t { namespace o2::aod::track { enum TrackTypeEnum : uint8_t { - Track = 0, + TrackIU = 0, // track at point of innermost update (not propagated) + Track = 1, Run2Track = 254, Run2Tracklet = 255 }; From c19cae07284b55e1dc7b095bc0a420e3df653bf9 Mon Sep 17 00:00:00 2001 From: Jan Fiete Date: Sun, 9 Oct 2022 12:52:17 +0200 Subject: [PATCH 2/3] backward compatible version --- Framework/Core/include/Framework/DataTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Core/include/Framework/DataTypes.h b/Framework/Core/include/Framework/DataTypes.h index 11990c1796b2b..00cc4b47c02b6 100644 --- a/Framework/Core/include/Framework/DataTypes.h +++ b/Framework/Core/include/Framework/DataTypes.h @@ -29,7 +29,7 @@ namespace o2::aod::track { enum TrackTypeEnum : uint8_t { TrackIU = 0, // track at point of innermost update (not propagated) - Track = 1, + Track = 0, // TODO will be changed to 1 when O2Physics PR merged Run2Track = 254, Run2Tracklet = 255 }; From c20d0f3e08ec82d902436bee1582cef264882a16 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sun, 9 Oct 2022 10:52:49 +0000 Subject: [PATCH 3/3] Please consider the following formatting changes --- Framework/Core/include/Framework/DataTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Core/include/Framework/DataTypes.h b/Framework/Core/include/Framework/DataTypes.h index 00cc4b47c02b6..82af2027f819c 100644 --- a/Framework/Core/include/Framework/DataTypes.h +++ b/Framework/Core/include/Framework/DataTypes.h @@ -29,7 +29,7 @@ namespace o2::aod::track { enum TrackTypeEnum : uint8_t { TrackIU = 0, // track at point of innermost update (not propagated) - Track = 0, // TODO will be changed to 1 when O2Physics PR merged + Track = 0, // TODO will be changed to 1 when O2Physics PR merged Run2Track = 254, Run2Tracklet = 255 };