From 70c01dde6cbc98863b5d2fcaf4d3b76f0ba1a768 Mon Sep 17 00:00:00 2001 From: David Dobrigkeit Chinellato Date: Thu, 1 Apr 2021 12:48:52 +0200 Subject: [PATCH 1/3] Run 2 enums from DataTypes --- .../AOD/include/UpgradesAODUtils/Run2LikeAO2D.h | 14 +------------- .../Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C | 8 ++++---- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/AOD/include/UpgradesAODUtils/Run2LikeAO2D.h b/Detectors/Upgrades/ALICE3/AOD/include/UpgradesAODUtils/Run2LikeAO2D.h index 6ef7f8fbde2b6..b43cf3999fa3b 100644 --- a/Detectors/Upgrades/ALICE3/AOD/include/UpgradesAODUtils/Run2LikeAO2D.h +++ b/Detectors/Upgrades/ALICE3/AOD/include/UpgradesAODUtils/Run2LikeAO2D.h @@ -52,18 +52,6 @@ enum TreeIndex { // Index of the output trees kTrees //N/A }; -enum TrackTypeEnum : uint8_t { - GlobalTrack = 0, - ITSStandalone, - MFTStandalone, - Run2GlobalTrack = 254, - Run2Tracklet = 255 -}; // corresponds to O2/Core/Framework/include/Framework/DataTypes.h -enum TrackFlagsRun2Enum { - ITSrefit = 0x1, - TPCrefit = 0x2, - GoldenChi2 = 0x4 -}; // corresponds to O2/Core/Framework/include/Framework/DataTypes.h enum MCParticleFlags : uint8_t { ProducedInTransport = 1 // Bit 0: 0 = from generator; 1 = from transport }; @@ -309,4 +297,4 @@ struct { } // namespace upgrades_utils } // namespace o2 -#endif \ No newline at end of file +#endif diff --git a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C index 6174a56b5d0b7..31c9925d89e1b 100644 --- a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C +++ b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C @@ -528,12 +528,12 @@ void ALICE3toAO2D() hPtSpectraFake->Fill(track.getPt()); tracks.fCollisionsID = lEventNumber; - tracks.fTrackType = TrackTypeEnum::Run2GlobalTrack; //Make track selection happy, please + tracks.fTrackType = o2::aod::track::TrackTypeEnum::Run2GlobalTrack; //Make track selection happy, please tracks.fFlags = 0x0; //Assume it all worked, fool regular selections - tracks.fFlags |= TrackFlagsRun2Enum::ITSrefit; - tracks.fFlags |= TrackFlagsRun2Enum::TPCrefit; - tracks.fFlags |= TrackFlagsRun2Enum::GoldenChi2; + tracks.fFlags |= o2::aod::track::TrackFlagsRun2Enum::ITSrefit; + tracks.fFlags |= o2::aod::track::TrackFlagsRun2Enum::TPCrefit; + tracks.fFlags |= o2::aod::track::TrackFlagsRun2Enum::GoldenChi2; //Main: X, alpha, track params tracks.fX = track.getX(); From 650f15a1c04e1b462aff19797b8a6679f8769ea0 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Thu, 1 Apr 2021 14:15:02 -0300 Subject: [PATCH 2/3] Update ALICE3toAO2D.C --- Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C index 31c9925d89e1b..e9cd72e051c02 100644 --- a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C +++ b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C @@ -528,7 +528,7 @@ void ALICE3toAO2D() hPtSpectraFake->Fill(track.getPt()); tracks.fCollisionsID = lEventNumber; - tracks.fTrackType = o2::aod::track::TrackTypeEnum::Run2GlobalTrack; //Make track selection happy, please + tracks.fTrackType = o2::aod::track::TrackTypeEnum::Run2Track; //Make track selection happy, please tracks.fFlags = 0x0; //Assume it all worked, fool regular selections tracks.fFlags |= o2::aod::track::TrackFlagsRun2Enum::ITSrefit; From 017f46afa6dbb26496f5be7d0e96d86e8037aa47 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 6 Apr 2021 06:02:27 -0300 Subject: [PATCH 3/3] Update ALICE3toAO2D.C --- Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C | 1 + 1 file changed, 1 insertion(+) diff --git a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C index e9cd72e051c02..f7ebbe8dc9129 100644 --- a/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C +++ b/Detectors/Upgrades/ALICE3/TRK/macros/ALICE3toAO2D.C @@ -48,6 +48,7 @@ #include "SimulationDataFormat/MCTruthContainer.h" #include "ReconstructionDataFormats/DCA.h" #include "ReconstructionDataFormats/Vertex.h" +#include "Framework/DataTypes.h" #include "UpgradesAODUtils/Run2LikeAO2D.h" #endif