From 6e621344fb8cecb7978b242aca25f4827d3c725f Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Wed, 21 Aug 2024 13:32:34 +0200 Subject: [PATCH 1/4] Data model: add uint8_t flag to tag upc reco settings --- Framework/Core/include/Framework/AnalysisDataModel.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 26df12c008bee..11a37117b8f6c 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -40,6 +40,7 @@ DECLARE_SOA_COLUMN(RunNumber, runNumber, int); //! Run number DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t); //! Bunch crossing number (globally unique in this run) DECLARE_SOA_COLUMN(TriggerMask, triggerMask, uint64_t); //! CTP trigger mask DECLARE_SOA_COLUMN(InputMask, inputMask, uint64_t); //! CTP input mask +DECLARE_SOA_COLUMN(Flags, flags, uint8_t); //! BC flags (e.g. tagging of UPC tracking settings, etc) } // namespace bc DECLARE_SOA_TABLE(BCs_000, "AOD", "BC", //! Root of data model for tables pointing to a bunch crossing @@ -50,6 +51,10 @@ DECLARE_SOA_TABLE_VERSIONED(BCs_001, "AOD", "BC", 1, //! Root of data model for o2::soa::Index<>, bc::RunNumber, bc::GlobalBC, bc::TriggerMask, bc::InputMask); +DECLARE_SOA_TABLE_VERSIONED(BCs_002, "AOD", "BC", 2, //! Root of data model for tables pointing to a bunch crossing, version 1 + o2::soa::Index<>, + bc::RunNumber, bc::GlobalBC, + bc::TriggerMask, bc::InputMask, bc::Flags); using BCs = BCs_001; // current version using BC = BCs::iterator; From ceb7ea9e8bf772c10fc282b6531ec3fca302070d Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 21 Aug 2024 11:48:24 +0000 Subject: [PATCH 2/4] Please consider the following formatting changes --- Framework/Core/include/Framework/AnalysisDataModel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 11a37117b8f6c..01e287ef1359c 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -40,7 +40,7 @@ DECLARE_SOA_COLUMN(RunNumber, runNumber, int); //! Run number DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t); //! Bunch crossing number (globally unique in this run) DECLARE_SOA_COLUMN(TriggerMask, triggerMask, uint64_t); //! CTP trigger mask DECLARE_SOA_COLUMN(InputMask, inputMask, uint64_t); //! CTP input mask -DECLARE_SOA_COLUMN(Flags, flags, uint8_t); //! BC flags (e.g. tagging of UPC tracking settings, etc) +DECLARE_SOA_COLUMN(Flags, flags, uint8_t); //! BC flags (e.g. tagging of UPC tracking settings, etc) } // namespace bc DECLARE_SOA_TABLE(BCs_000, "AOD", "BC", //! Root of data model for tables pointing to a bunch crossing From 125d02efbf8382b8d4bee92607a421b996584003 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Thu, 22 Aug 2024 15:42:48 +0200 Subject: [PATCH 3/4] Switch to standalone BCFlags table --- Framework/Core/include/Framework/AnalysisDataModel.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h index 01e287ef1359c..6dc6c198bc183 100644 --- a/Framework/Core/include/Framework/AnalysisDataModel.h +++ b/Framework/Core/include/Framework/AnalysisDataModel.h @@ -51,10 +51,8 @@ DECLARE_SOA_TABLE_VERSIONED(BCs_001, "AOD", "BC", 1, //! Root of data model for o2::soa::Index<>, bc::RunNumber, bc::GlobalBC, bc::TriggerMask, bc::InputMask); -DECLARE_SOA_TABLE_VERSIONED(BCs_002, "AOD", "BC", 2, //! Root of data model for tables pointing to a bunch crossing, version 1 - o2::soa::Index<>, - bc::RunNumber, bc::GlobalBC, - bc::TriggerMask, bc::InputMask, bc::Flags); +DECLARE_SOA_TABLE(BCFlags, "AOD", "BCFLAG", //! flag for tagging UPCs, joinable with BCs + bc::Flags); using BCs = BCs_001; // current version using BC = BCs::iterator; From cb47932c852bd36219821c80ba92c25fa14f2738 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 24 Aug 2024 08:46:51 +0200 Subject: [PATCH 4/4] HistogramSpec: add missing L types --- Framework/Core/include/Framework/HistogramSpec.h | 6 ++++++ Framework/Core/src/HistogramSpec.cxx | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Framework/Core/include/Framework/HistogramSpec.h b/Framework/Core/include/Framework/HistogramSpec.h index 5b0c7931d1c65..bfd9ba702496d 100644 --- a/Framework/Core/include/Framework/HistogramSpec.h +++ b/Framework/Core/include/Framework/HistogramSpec.h @@ -38,16 +38,19 @@ enum HistType : unsigned int { kTH1D, kTH1F, kTH1I, + kTH1L, kTH1C, kTH1S, kTH2D, kTH2F, kTH2I, + kTH2L, kTH2C, kTH2S, kTH3D, kTH3F, kTH3I, + kTH3L, kTH3C, kTH3S, kTHnD, @@ -227,16 +230,19 @@ struct HistFactory { DECLAREEXT(TH1D); DECLAREEXT(TH1F); DECLAREEXT(TH1I); +DECLAREEXT(TH1L); DECLAREEXT(TH1C); DECLAREEXT(TH1S); DECLAREEXT(TH2D); DECLAREEXT(TH2F); DECLAREEXT(TH2I); +DECLAREEXT(TH2L); DECLAREEXT(TH2C); DECLAREEXT(TH2S); DECLAREEXT(TH3D); DECLAREEXT(TH3F); DECLAREEXT(TH3I); +DECLAREEXT(TH3L); DECLAREEXT(TH3C); DECLAREEXT(TH3S); DECLAREEXT(THnD); diff --git a/Framework/Core/src/HistogramSpec.cxx b/Framework/Core/src/HistogramSpec.cxx index 1ac3d2f920d5d..ef23a29c828f7 100644 --- a/Framework/Core/src/HistogramSpec.cxx +++ b/Framework/Core/src/HistogramSpec.cxx @@ -150,18 +150,21 @@ HistPtr HistFactory::createHistVariant(const HistogramSpec& histSpec) CREATE_HIST_CASE(TH1D, TH1) CREATE_HIST_CASE(TH1F, TH1) CREATE_HIST_CASE(TH1I, TH1) + CREATE_HIST_CASE(TH1L, TH1) CREATE_HIST_CASE(TH1C, TH1) CREATE_HIST_CASE(TH1S, TH1) CREATE_HIST_CASE(TH2D, TH2) CREATE_HIST_CASE(TH2F, TH2) CREATE_HIST_CASE(TH2I, TH2) + CREATE_HIST_CASE(TH2L, TH2) CREATE_HIST_CASE(TH2C, TH2) CREATE_HIST_CASE(TH2S, TH2) CREATE_HIST_CASE(TH3D, TH3) CREATE_HIST_CASE(TH3F, TH3) CREATE_HIST_CASE(TH3I, TH3) + CREATE_HIST_CASE(TH3L, TH3) CREATE_HIST_CASE(TH3C, TH3) CREATE_HIST_CASE(TH3S, TH3) @@ -215,16 +218,19 @@ TAxis* HistFactory::getAxis(const int i, T* hist) EXPIMPL(TH1D); EXPIMPL(TH1F); EXPIMPL(TH1I); +EXPIMPL(TH1L); EXPIMPL(TH1C); EXPIMPL(TH1S); EXPIMPL(TH2D); EXPIMPL(TH2F); EXPIMPL(TH2I); +EXPIMPL(TH2L); EXPIMPL(TH2C); EXPIMPL(TH2S); EXPIMPL(TH3D); EXPIMPL(TH3F); EXPIMPL(TH3I); +EXPIMPL(TH3L); EXPIMPL(TH3C); EXPIMPL(TH3S); EXPIMPL(THnD);