Skip to content

Commit c8bfd76

Browse files
sigurdnesesigurdnese
committed
Make new FIT variables compatible with JSON config
1 parent 01e06be commit c8bfd76

File tree

3 files changed

+83
-56
lines changed

3 files changed

+83
-56
lines changed

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 78 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,6 +1346,58 @@ void VarManager::SetDefaultVarNames()
13461346
fgVariableUnits[kBdtPrompt] = " ";
13471347
fgVariableNames[kBdtNonprompt] = "kBdtNonprompt";
13481348
fgVariableUnits[kBdtNonprompt] = " ";
1349+
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
1350+
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
1351+
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
1352+
fgVariableUnits[kAmplitudeFT0C] = "a.u.";
1353+
fgVariableNames[kTimeFT0A] = "FT0A time";
1354+
fgVariableUnits[kTimeFT0A] = "ns";
1355+
fgVariableNames[kTimeFT0C] = "FT0C time";
1356+
fgVariableUnits[kTimeFT0C] = "ns";
1357+
fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
1358+
fgVariableUnits[kTriggerMaskFT0] = "";
1359+
fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
1360+
fgVariableUnits[kNFiredChannelsFT0A] = "";
1361+
fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
1362+
fgVariableUnits[kNFiredChannelsFT0C] = "";
1363+
fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
1364+
fgVariableUnits[kAmplitudeFDDA] = "a.u.";
1365+
fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
1366+
fgVariableUnits[kAmplitudeFDDC] = "a.u.";
1367+
fgVariableNames[kTimeFDDA] = "FDDA time";
1368+
fgVariableUnits[kTimeFDDA] = "ns";
1369+
fgVariableNames[kTimeFDDC] = "FDDC time";
1370+
fgVariableUnits[kTimeFDDC] = "ns";
1371+
fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
1372+
fgVariableUnits[kTriggerMaskFDD] = "";
1373+
fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
1374+
fgVariableUnits[kAmplitudeFV0A] = "a.u.";
1375+
fgVariableNames[kTimeFV0A] = "FV0A time";
1376+
fgVariableUnits[kTimeFV0A] = "ns";
1377+
fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
1378+
fgVariableUnits[kTriggerMaskFV0A] = "";
1379+
fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
1380+
fgVariableUnits[kNFiredChannelsFV0A] = "";
1381+
fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
1382+
fgVariableUnits[kBBFT0Apf] = "";
1383+
fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
1384+
fgVariableUnits[kBGFT0Apf] = "";
1385+
fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
1386+
fgVariableUnits[kBBFT0Cpf] = "";
1387+
fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
1388+
fgVariableUnits[kBGFT0Cpf] = "";
1389+
fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
1390+
fgVariableUnits[kBBFV0Apf] = "";
1391+
fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
1392+
fgVariableUnits[kBGFV0Apf] = "";
1393+
fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
1394+
fgVariableUnits[kBBFDDApf] = "";
1395+
fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
1396+
fgVariableUnits[kBGFDDApf] = "";
1397+
fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
1398+
fgVariableUnits[kBBFDDCpf] = "";
1399+
fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
1400+
fgVariableUnits[kBGFDDCpf] = "";
13491401

13501402
// Set the variables short names map. This is needed for dynamic configuration via JSON files
13511403
fgVarNamesMap["kNothing"] = kNothing;
@@ -2002,56 +2054,30 @@ void VarManager::SetDefaultVarNames()
20022054
fgVarNamesMap["kBdtBackground"] = kBdtBackground;
20032055
fgVarNamesMap["kBdtPrompt"] = kBdtPrompt;
20042056
fgVarNamesMap["kBdtNonprompt"] = kBdtNonprompt;
2005-
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
2006-
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
2007-
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
2008-
fgVariableUnits[kAmplitudeFT0C] = "a.u.";
2009-
fgVariableNames[kTimeFT0A] = "FT0A time";
2010-
fgVariableUnits[kTimeFT0A] = "ns";
2011-
fgVariableNames[kTimeFT0C] = "FT0C time";
2012-
fgVariableUnits[kTimeFT0C] = "ns";
2013-
fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
2014-
fgVariableUnits[kTriggerMaskFT0] = "";
2015-
fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
2016-
fgVariableUnits[kNFiredChannelsFT0A] = "";
2017-
fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
2018-
fgVariableUnits[kNFiredChannelsFT0C] = "";
2019-
fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
2020-
fgVariableUnits[kAmplitudeFDDA] = "a.u.";
2021-
fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
2022-
fgVariableUnits[kAmplitudeFDDC] = "a.u.";
2023-
fgVariableNames[kTimeFDDA] = "FDDA time";
2024-
fgVariableUnits[kTimeFDDA] = "ns";
2025-
fgVariableNames[kTimeFDDC] = "FDDC time";
2026-
fgVariableUnits[kTimeFDDC] = "ns";
2027-
fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
2028-
fgVariableUnits[kTriggerMaskFDD] = "";
2029-
fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
2030-
fgVariableUnits[kAmplitudeFV0A] = "a.u.";
2031-
fgVariableNames[kTimeFV0A] = "FV0A time";
2032-
fgVariableUnits[kTimeFV0A] = "ns";
2033-
fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
2034-
fgVariableUnits[kTriggerMaskFV0A] = "";
2035-
fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
2036-
fgVariableUnits[kNFiredChannelsFV0A] = "";
2037-
fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
2038-
fgVariableUnits[kBBFT0Apf] = "";
2039-
fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
2040-
fgVariableUnits[kBGFT0Apf] = "";
2041-
fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
2042-
fgVariableUnits[kBBFT0Cpf] = "";
2043-
fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
2044-
fgVariableUnits[kBGFT0Cpf] = "";
2045-
fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
2046-
fgVariableUnits[kBBFV0Apf] = "";
2047-
fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
2048-
fgVariableUnits[kBGFV0Apf] = "";
2049-
fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
2050-
fgVariableUnits[kBBFDDApf] = "";
2051-
fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
2052-
fgVariableUnits[kBGFDDApf] = "";
2053-
fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
2054-
fgVariableUnits[kBBFDDCpf] = "";
2055-
fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
2056-
fgVariableUnits[kBGFDDCpf] = "";
2057+
fgVarNamesMap["kAmplitudeFT0A"] = kAmplitudeFT0A;
2058+
fgVarNamesMap["kAmplitudeFT0C"] = kAmplitudeFT0C;
2059+
fgVarNamesMap["kTimeFT0A"] = kTimeFT0A;
2060+
fgVarNamesMap["kTimeFT0C"] = kTimeFT0C;
2061+
fgVarNamesMap["kTriggerMaskFT0"] = kTriggerMaskFT0;
2062+
fgVarNamesMap["kNFiredChannelsFT0A"] = kNFiredChannelsFT0A;
2063+
fgVarNamesMap["kNFiredChannelsFT0C"] = kNFiredChannelsFT0C;
2064+
fgVarNamesMap["kAmplitudeFDDA"] = kAmplitudeFDDA;
2065+
fgVarNamesMap["kAmplitudeFDDC"] = kAmplitudeFDDC;
2066+
fgVarNamesMap["kTimeFDDA"] = kTimeFDDA;
2067+
fgVarNamesMap["kTimeFDDC"] = kTimeFDDC;
2068+
fgVarNamesMap["kTriggerMaskFDD"] = kTriggerMaskFDD;
2069+
fgVarNamesMap["kAmplitudeFV0A"] = kAmplitudeFV0A;
2070+
fgVarNamesMap["kTimeFV0A"] = kTimeFV0A;
2071+
fgVarNamesMap["kTriggerMaskFV0A"] = kTriggerMaskFV0A;
2072+
fgVarNamesMap["kNFiredChannelsFV0A"] = kNFiredChannelsFV0A;
2073+
fgVarNamesMap["kBBFT0Apf"] = kBBFT0Apf;
2074+
fgVarNamesMap["kBGFT0Apf"] = kBGFT0Apf;
2075+
fgVarNamesMap["kBBFT0Cpf"] = kBBFT0Cpf;
2076+
fgVarNamesMap["kBGFT0Cpf"] = kBGFT0Cpf;
2077+
fgVarNamesMap["kBBFV0Apf"] = kBBFV0Apf;
2078+
fgVarNamesMap["kBGFV0Apf"] = kBGFV0Apf;
2079+
fgVarNamesMap["kBBFDDApf"] = kBBFDDApf;
2080+
fgVarNamesMap["kBGFDDApf"] = kBGFDDApf;
2081+
fgVarNamesMap["kBBFDDCpf"] = kBBFDDCpf;
2082+
fgVarNamesMap["kBGFDDCpf"] = kBGFDDCpf;
20572083
}

‎PWGDQ/Core/VarManager.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ class VarManager : public TObject
110110
ReducedEventMultExtra = BIT(19),
111111
CollisionQvectCentr = BIT(20),
112112
RapidityGapFilter = BIT(21),
113-
ReducedFit = BIT(22),
113+
Fit = BIT(22),
114+
ReducedFit = BIT(23),
114115
Track = BIT(0),
115116
TrackCov = BIT(1),
116117
TrackExtra = BIT(2),

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ constexpr static uint32_t gkEventFillMapWithMultsZdc = VarManager::ObjTypes::BC
131131
constexpr static uint32_t gkEventFillMapWithMultsAndEventFilter = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::EventFilter;
132132
constexpr static uint32_t gkEventFillMapWithMultsEventFilterZdc = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::EventFilter | VarManager::ObjTypes::Zdc;
133133
// constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdc = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc;
134-
constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdcFit = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc | VarManager::ObjTypes::ReducedFit;
134+
constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilterZdcFit = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionMult | VarManager::ObjTypes::CollisionMultExtra | VarManager::ObjTypes::RapidityGapFilter | VarManager::ObjTypes::Zdc | VarManager::ObjTypes::Fit;
135135
// constexpr static uint32_t gkEventFillMapWithCent = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCent;
136136
constexpr static uint32_t gkEventFillMapWithCentAndMults = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCent | VarManager::CollisionMult | VarManager::ObjTypes::CollisionMultExtra;
137137
constexpr static uint32_t gkEventFillMapWithMultsExtra = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::CollisionMult | VarManager::ObjTypes::CollisionMultExtra;
@@ -867,7 +867,7 @@ struct TableMaker {
867867
}
868868
}
869869
// Fill FIT info using newbc pattern for UPC events (similar to ZDC)
870-
if constexpr ((TEventFillMap & VarManager::ObjTypes::ReducedFit) > 0) {
870+
if constexpr ((TEventFillMap & VarManager::ObjTypes::Fit) > 0) {
871871
if constexpr (!std::is_same_v<TFt0s, std::nullptr_t> &&
872872
!std::is_same_v<TFv0as, std::nullptr_t> &&
873873
!std::is_same_v<TFdds, std::nullptr_t>) {
@@ -987,7 +987,7 @@ struct TableMaker {
987987
}
988988
}
989989
// Fill FIT table if requested
990-
if constexpr ((TEventFillMap & VarManager::ObjTypes::ReducedFit) > 0) {
990+
if constexpr ((TEventFillMap & VarManager::ObjTypes::Fit) > 0) {
991991
fit(VarManager::fgValues[VarManager::kAmplitudeFT0A], VarManager::fgValues[VarManager::kAmplitudeFT0C],
992992
VarManager::fgValues[VarManager::kTimeFT0A], VarManager::fgValues[VarManager::kTimeFT0C],
993993
static_cast<uint8_t>(VarManager::fgValues[VarManager::kTriggerMaskFT0]),

0 commit comments

Comments
 (0)