Skip to content

HistogramSpec: add missing L types #13427

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

Closed
ddobrigk wants to merge 5 commits into from
Closed

HistogramSpec: add missing L types #13427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e62134
Data model: add uint8_t flag to tag upc reco settings
ddobrigk Aug 21, 2024
ceb7ea9
Please consider the following formatting changes
alibuild Aug 21, 2024
73177b8
Merge pull request #34 from alibuild/alibot-cleanup-13411
ddobrigk Aug 21, 2024
125d02e
Switch to standalone BCFlags table
ddobrigk Aug 22, 2024
cb47932
HistogramSpec: add missing L types
ddobrigk Aug 24, 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
3 changes: 3 additions & 0 deletions Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -50,6 +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(BCFlags, "AOD", "BCFLAG", //! flag for tagging UPCs, joinable with BCs
bc::Flags);

using BCs = BCs_001; // current version
using BC = BCs::iterator;
Expand Down
6 changes: 6 additions & 0 deletions Framework/Core/include/Framework/HistogramSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions Framework/Core/src/HistogramSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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);
Expand Down