Skip to content

Commit 9a9e093

Browse files
committed
code optimization for filling FIT info; support native UDhelper
1 parent 8bad4c2 commit 9a9e093

File tree

4 files changed

+181
-531
lines changed

4 files changed

+181
-531
lines changed

PWGDQ/Core/VarManager.cxx

Lines changed: 52 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -499,72 +499,6 @@ void VarManager::SetDefaultVarNames()
499499
fgVariableUnits[kTimeZPA] = "";
500500
fgVariableNames[kTimeZPC] = "ZPC time";
501501
fgVariableUnits[kTimeZPC] = "";
502-
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
503-
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
504-
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
505-
fgVariableUnits[kAmplitudeFT0C] = "a.u.";
506-
fgVariableNames[kTimeFT0A] = "FT0A time";
507-
fgVariableUnits[kTimeFT0A] = "ns";
508-
fgVariableNames[kTimeFT0C] = "FT0C time";
509-
fgVariableUnits[kTimeFT0C] = "ns";
510-
fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
511-
fgVariableUnits[kTriggerMaskFT0] = "";
512-
fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
513-
fgVariableUnits[kNFiredChannelsFT0A] = "";
514-
fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
515-
fgVariableUnits[kNFiredChannelsFT0C] = "";
516-
fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
517-
fgVariableUnits[kAmplitudeFDDA] = "a.u.";
518-
fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
519-
fgVariableUnits[kAmplitudeFDDC] = "a.u.";
520-
fgVariableNames[kTimeFDDA] = "FDDA time";
521-
fgVariableUnits[kTimeFDDA] = "ns";
522-
fgVariableNames[kTimeFDDC] = "FDDC time";
523-
fgVariableUnits[kTimeFDDC] = "ns";
524-
fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
525-
fgVariableUnits[kTriggerMaskFDD] = "";
526-
fgVariableNames[kNFiredChannelsFDDA] = "FDDA fired channels";
527-
fgVariableUnits[kNFiredChannelsFDDA] = "";
528-
fgVariableNames[kNFiredChannelsFDDC] = "FDDC fired channels";
529-
fgVariableUnits[kNFiredChannelsFDDC] = "";
530-
fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
531-
fgVariableUnits[kAmplitudeFV0A] = "a.u.";
532-
fgVariableNames[kTimeFV0A] = "FV0A time";
533-
fgVariableUnits[kTimeFV0A] = "ns";
534-
fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
535-
fgVariableUnits[kTriggerMaskFV0A] = "";
536-
fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
537-
fgVariableUnits[kNFiredChannelsFV0A] = "";
538-
fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
539-
fgVariableUnits[kBBFT0Apf] = "";
540-
fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
541-
fgVariableUnits[kBGFT0Apf] = "";
542-
fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
543-
fgVariableUnits[kBBFT0Cpf] = "";
544-
fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
545-
fgVariableUnits[kBGFT0Cpf] = "";
546-
fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
547-
fgVariableUnits[kBBFV0Apf] = "";
548-
fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
549-
fgVariableUnits[kBGFV0Apf] = "";
550-
fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
551-
fgVariableUnits[kBBFDDApf] = "";
552-
fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
553-
fgVariableUnits[kBGFDDApf] = "";
554-
fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
555-
fgVariableUnits[kBBFDDCpf] = "";
556-
fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
557-
fgVariableUnits[kBGFDDCpf] = "";
558-
fgVariableNames[kDistClosestBcTOR] = "Distance to closest BC with TOR";
559-
fgVariableUnits[kDistClosestBcTOR] = "BC";
560-
fgVariableNames[kDistClosestBcTSC] = "Distance to closest BC with TSC";
561-
fgVariableUnits[kDistClosestBcTSC] = "BC";
562-
fgVariableNames[kDistClosestBcTVX] = "Distance to closest BC with TVX";
563-
fgVariableUnits[kDistClosestBcTVX] = "BC";
564-
fgVariableNames[kDistClosestBcV0A] = "Distance to closest BC with V0A";
565-
fgVariableUnits[kDistClosestBcV0A] = "BC";
566-
fgVariableNames[kDistClosestBcT0A] = "Distance to closest BC with T0A";
567-
fgVariableUnits[kDistClosestBcT0A] = "BC";
568502
fgVariableNames[kMultNTracksHasITS] = "#tracks in PV with ITS";
569503
fgVariableUnits[kMultNTracksHasITS] = "";
570504
fgVariableNames[kMultNTracksHasTPC] = "#tracks in PV with TPC";
@@ -1620,39 +1554,6 @@ void VarManager::SetDefaultVarNames()
16201554
fgVarNamesMap["kTimeZNC"] = kTimeZNC;
16211555
fgVarNamesMap["kTimeZPA"] = kTimeZPA;
16221556
fgVarNamesMap["kTimeZPC"] = kTimeZPC;
1623-
fgVarNamesMap["kAmplitudeFT0A"] = kAmplitudeFT0A;
1624-
fgVarNamesMap["kAmplitudeFT0C"] = kAmplitudeFT0C;
1625-
fgVarNamesMap["kTimeFT0A"] = kTimeFT0A;
1626-
fgVarNamesMap["kTimeFT0C"] = kTimeFT0C;
1627-
fgVarNamesMap["kTriggerMaskFT0"] = kTriggerMaskFT0;
1628-
fgVarNamesMap["kNFiredChannelsFT0A"] = kNFiredChannelsFT0A;
1629-
fgVarNamesMap["kNFiredChannelsFT0C"] = kNFiredChannelsFT0C;
1630-
fgVarNamesMap["kAmplitudeFDDA"] = kAmplitudeFDDA;
1631-
fgVarNamesMap["kAmplitudeFDDC"] = kAmplitudeFDDC;
1632-
fgVarNamesMap["kTimeFDDA"] = kTimeFDDA;
1633-
fgVarNamesMap["kTimeFDDC"] = kTimeFDDC;
1634-
fgVarNamesMap["kTriggerMaskFDD"] = kTriggerMaskFDD;
1635-
fgVarNamesMap["kNFiredChannelsFDDA"] = kNFiredChannelsFDDA;
1636-
fgVarNamesMap["kNFiredChannelsFDDC"] = kNFiredChannelsFDDC;
1637-
fgVarNamesMap["kAmplitudeFV0A"] = kAmplitudeFV0A;
1638-
fgVarNamesMap["kTimeFV0A"] = kTimeFV0A;
1639-
fgVarNamesMap["kTriggerMaskFV0A"] = kTriggerMaskFV0A;
1640-
fgVarNamesMap["kNFiredChannelsFV0A"] = kNFiredChannelsFV0A;
1641-
fgVarNamesMap["kBBFT0Apf"] = kBBFT0Apf;
1642-
fgVarNamesMap["kBGFT0Apf"] = kBGFT0Apf;
1643-
fgVarNamesMap["kBBFT0Cpf"] = kBBFT0Cpf;
1644-
fgVarNamesMap["kBGFT0Cpf"] = kBGFT0Cpf;
1645-
fgVarNamesMap["kBBFV0Apf"] = kBBFV0Apf;
1646-
fgVarNamesMap["kBGFV0Apf"] = kBGFV0Apf;
1647-
fgVarNamesMap["kBBFDDApf"] = kBBFDDApf;
1648-
fgVarNamesMap["kBGFDDApf"] = kBGFDDApf;
1649-
fgVarNamesMap["kBBFDDCpf"] = kBBFDDCpf;
1650-
fgVarNamesMap["kBGFDDCpf"] = kBGFDDCpf;
1651-
fgVarNamesMap["kDistClosestBcTOR"] = kDistClosestBcTOR;
1652-
fgVarNamesMap["kDistClosestBcTSC"] = kDistClosestBcTSC;
1653-
fgVarNamesMap["kDistClosestBcTVX"] = kDistClosestBcTVX;
1654-
fgVarNamesMap["kDistClosestBcV0A"] = kDistClosestBcV0A;
1655-
fgVarNamesMap["kDistClosestBcT0A"] = kDistClosestBcT0A;
16561557
fgVarNamesMap["kQ2X0A1"] = kQ2X0A1;
16571558
fgVarNamesMap["kQ2X0A2"] = kQ2X0A2;
16581559
fgVarNamesMap["kQ2Y0A1"] = kQ2Y0A1;
@@ -2069,4 +1970,56 @@ void VarManager::SetDefaultVarNames()
20691970
fgVarNamesMap["kBdtBackground"] = kBdtBackground;
20701971
fgVarNamesMap["kBdtPrompt"] = kBdtPrompt;
20711972
fgVarNamesMap["kBdtNonprompt"] = kBdtNonprompt;
1973+
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
1974+
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
1975+
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
1976+
fgVariableUnits[kAmplitudeFT0C] = "a.u.";
1977+
fgVariableNames[kTimeFT0A] = "FT0A time";
1978+
fgVariableUnits[kTimeFT0A] = "ns";
1979+
fgVariableNames[kTimeFT0C] = "FT0C time";
1980+
fgVariableUnits[kTimeFT0C] = "ns";
1981+
fgVariableNames[kTriggerMaskFT0] = "FT0 trigger mask";
1982+
fgVariableUnits[kTriggerMaskFT0] = "";
1983+
fgVariableNames[kNFiredChannelsFT0A] = "FT0A fired channels";
1984+
fgVariableUnits[kNFiredChannelsFT0A] = "";
1985+
fgVariableNames[kNFiredChannelsFT0C] = "FT0C fired channels";
1986+
fgVariableUnits[kNFiredChannelsFT0C] = "";
1987+
fgVariableNames[kAmplitudeFDDA] = "FDDA amplitude";
1988+
fgVariableUnits[kAmplitudeFDDA] = "a.u.";
1989+
fgVariableNames[kAmplitudeFDDC] = "FDDC amplitude";
1990+
fgVariableUnits[kAmplitudeFDDC] = "a.u.";
1991+
fgVariableNames[kTimeFDDA] = "FDDA time";
1992+
fgVariableUnits[kTimeFDDA] = "ns";
1993+
fgVariableNames[kTimeFDDC] = "FDDC time";
1994+
fgVariableUnits[kTimeFDDC] = "ns";
1995+
fgVariableNames[kTriggerMaskFDD] = "FDD trigger mask";
1996+
fgVariableUnits[kTriggerMaskFDD] = "";
1997+
fgVariableNames[kAmplitudeFV0A] = "FV0A amplitude";
1998+
fgVariableUnits[kAmplitudeFV0A] = "a.u.";
1999+
fgVariableNames[kTimeFV0A] = "FV0A time";
2000+
fgVariableUnits[kTimeFV0A] = "ns";
2001+
fgVariableNames[kTriggerMaskFV0A] = "FV0A trigger mask";
2002+
fgVariableUnits[kTriggerMaskFV0A] = "";
2003+
fgVariableNames[kNFiredChannelsFV0A] = "FV0A fired channels";
2004+
fgVariableUnits[kNFiredChannelsFV0A] = "";
2005+
fgVariableNames[kBBFT0Apf] = "FT0A BB pileup flag";
2006+
fgVariableUnits[kBBFT0Apf] = "";
2007+
fgVariableNames[kBGFT0Apf] = "FT0A BG pileup flag";
2008+
fgVariableUnits[kBGFT0Apf] = "";
2009+
fgVariableNames[kBBFT0Cpf] = "FT0C BB pileup flag";
2010+
fgVariableUnits[kBBFT0Cpf] = "";
2011+
fgVariableNames[kBGFT0Cpf] = "FT0C BG pileup flag";
2012+
fgVariableUnits[kBGFT0Cpf] = "";
2013+
fgVariableNames[kBBFV0Apf] = "FV0A BB pileup flag";
2014+
fgVariableUnits[kBBFV0Apf] = "";
2015+
fgVariableNames[kBGFV0Apf] = "FV0A BG pileup flag";
2016+
fgVariableUnits[kBGFV0Apf] = "";
2017+
fgVariableNames[kBBFDDApf] = "FDDA BB pileup flag";
2018+
fgVariableUnits[kBBFDDApf] = "";
2019+
fgVariableNames[kBGFDDApf] = "FDDA BG pileup flag";
2020+
fgVariableUnits[kBGFDDApf] = "";
2021+
fgVariableNames[kBBFDDCpf] = "FDDC BB pileup flag";
2022+
fgVariableUnits[kBBFDDCpf] = "";
2023+
fgVariableNames[kBGFDDCpf] = "FDDC BG pileup flag";
2024+
fgVariableUnits[kBGFDDCpf] = "";
20722025
}

0 commit comments

Comments
 (0)