Skip to content

Commit f33c655

Browse files
minjungkim12minjungkim12
authored
Merge pull request #2 from alibuild/alibot-cleanup-13773
Please consider the following formatting changes to #13773
2 parents 9a9e093 + d107c17 commit f33c655

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@ void VarManager::SetDefaultVarNames()
19701970
fgVarNamesMap["kBdtBackground"] = kBdtBackground;
19711971
fgVarNamesMap["kBdtPrompt"] = kBdtPrompt;
19721972
fgVarNamesMap["kBdtNonprompt"] = kBdtNonprompt;
1973-
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
1973+
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
19741974
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
19751975
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
19761976
fgVariableUnits[kAmplitudeFT0C] = "a.u.";

‎PWGDQ/Core/VarManager.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,11 +5909,11 @@ void VarManager::FillFIT(T1 const& bc, T2 const& bcs, T3 const& ft0s, T4 const&
59095909
values[kTimeFT0C] = fitInfo.timeFT0C;
59105910
values[kTriggerMaskFT0] = static_cast<float>(fitInfo.triggerMaskFT0);
59115911
const auto ft0Index = bc.ft0Id();
5912-
if(ft0Index < 0 || ft0Index >= ft0s.size()) {
5912+
if (ft0Index < 0 || ft0Index >= ft0s.size()) {
59135913
values[kNFiredChannelsFT0A] = -1;
59145914
values[kNFiredChannelsFT0C] = -1;
59155915
} else {
5916-
const auto ft0 = ft0s.iteratorAt(ft0Index);
5916+
const auto ft0 = ft0s.iteratorAt(ft0Index);
59175917
values[kNFiredChannelsFT0A] = ft0.channelA().size();
59185918
values[kNFiredChannelsFT0C] = ft0.channelC().size();
59195919
}
@@ -5929,7 +5929,7 @@ void VarManager::FillFIT(T1 const& bc, T2 const& bcs, T3 const& ft0s, T4 const&
59295929
values[kTimeFV0A] = fitInfo.timeFV0A;
59305930
values[kTriggerMaskFV0A] = static_cast<float>(fitInfo.triggerMaskFV0A);
59315931
const auto fv0aIndex = bc.fv0aId();
5932-
if(fv0aIndex < 0 || fv0aIndex >= fv0as.size()) {
5932+
if (fv0aIndex < 0 || fv0aIndex >= fv0as.size()) {
59335933
values[kNFiredChannelsFV0A] = -1;
59345934
} else {
59355935
const auto fv0a = fv0as.iteratorAt(fv0aIndex);

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -793,12 +793,12 @@ struct TableMaker {
793793
} // end loop over collisions
794794
}
795795

796-
template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TBCs,
797-
typename TZdcs, typename TTrackAssoc, typename TTracks,
798-
typename TFt0s, typename TFv0as, typename TFdds>
799-
void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*zdcs*/,
800-
TTrackAssoc const& trackAssocs, TTracks const& tracks,
801-
TFt0s const& ft0s, TFv0as const& fv0as, TFdds const& fdds)
796+
template <uint32_t TEventFillMap, uint32_t TTrackFillMap, typename TEvents, typename TBCs,
797+
typename TZdcs, typename TTrackAssoc, typename TTracks,
798+
typename TFt0s, typename TFv0as, typename TFdds>
799+
void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*zdcs*/,
800+
TTrackAssoc const& trackAssocs, TTracks const& tracks,
801+
TFt0s const& ft0s, TFv0as const& fv0as, TFdds const& fdds)
802802
{
803803
// Skim collisions
804804
// NOTE: So far, collisions are filtered based on the user specified analysis cuts AND the filterPP or Zorro event filter.
@@ -1593,76 +1593,76 @@ void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*z
15931593
TrackAssoc const& trackAssocs, FwdTrackAssoc const& fwdTrackAssocs,
15941594
MFTTrackAssoc const& mftAssocs)
15951595
{
1596-
fullSkimming<gkEventFillMapWithMultsAndEventFilter, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, tracksBarrel, muons, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr,nullptr);
1596+
fullSkimming<gkEventFillMapWithMultsAndEventFilter, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, tracksBarrel, muons, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
15971597
}
15981598

15991599
// produce the barrel-only DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), subscribe to the DQ event filter (filter-pp or filter-PbPb)
16001600
void processPPWithFilterBarrelOnly(MyEventsWithMultsAndFilter const& collisions, MyBCs const& bcs, aod::Zdcs& zdcs,
16011601
MyBarrelTracksWithCov const& tracksBarrel,
16021602
TrackAssoc const& trackAssocs)
16031603
{
1604-
fullSkimming<gkEventFillMapWithMultsEventFilterZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr,nullptr,nullptr);
1604+
fullSkimming<gkEventFillMapWithMultsEventFilterZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
16051605
}
16061606

16071607
// produce the muon-only DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), subscribe to the DQ event filter (filter-pp or filter-PbPb)
16081608
void processPPWithFilterMuonOnly(MyEventsWithMultsAndFilter const& collisions, BCsWithTimestamps const& bcs,
16091609
MyMuonsWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
16101610
{
1611-
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
1611+
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
16121612
}
16131613

16141614
// produce the muon+mft DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), subscribe to the DQ event filter (filter-pp or filter-PbPb)
16151615
void processPPWithFilterMuonMFT(MyEventsWithMultsAndFilter const& collisions, BCsWithTimestamps const& bcs,
16161616
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
16171617
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
16181618
{
1619-
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
1619+
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
16201620
}
16211621

16221622
// produce the barrel-only DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), meant to run on skimmed data
16231623
void processPPBarrelOnly(MyEventsWithMults const& collisions, MyBCs const& bcs, aod::Zdcs& zdcs,
16241624
MyBarrelTracksWithCov const& tracksBarrel,
16251625
TrackAssoc const& trackAssocs)
16261626
{
1627-
fullSkimming<gkEventFillMapWithMultsZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr,nullptr,nullptr);
1627+
fullSkimming<gkEventFillMapWithMultsZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
16281628
}
16291629

16301630
// produce the barrel-only DQ skimmed barrel data model, with V0 tagged tracks
16311631
void processPPBarrelOnlyWithV0s(MyEventsWithMults const& collisions, MyBCs const& bcs,
16321632
MyBarrelTracksWithV0BitsNoTOF const& tracksBarrel,
16331633
TrackAssoc const& trackAssocs)
16341634
{
1635-
fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithV0BitsNoTOF, 0u, 0u>(collisions, bcs, nullptr, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr,nullptr,nullptr);
1635+
fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithV0BitsNoTOF, 0u, 0u>(collisions, bcs, nullptr, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
16361636
}
16371637

16381638
// produce the muon-only DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), meant to run on skimmed data
16391639
void processPPMuonOnly(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
16401640
MyMuonsWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
16411641
{
1642-
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
1642+
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
16431643
}
16441644

16451645
// produce the realigned muon-only DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), meant to run on skimmed data
16461646
void processPPRealignedMuonOnly(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
16471647
MyMuonsRealignWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
16481648
{
1649-
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
1649+
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
16501650
}
16511651

16521652
// produce the muon+mft DQ skimmed data model typically for pp/p-Pb or UPC Pb-Pb (no centrality), meant to run on skimmed data
16531653
void processPPMuonMFT(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
16541654
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
16551655
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
16561656
{
1657-
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
1657+
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
16581658
}
16591659

16601660
// Central barrel multiplicity estimation
16611661
void processPPMuonMFTWithMultsExtra(MyEventsWithMultsExtra const& collisions, BCsWithTimestamps const& bcs,
16621662
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
16631663
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
16641664
{
1665-
fullSkimming<gkEventFillMapWithMultsExtra, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
1665+
fullSkimming<gkEventFillMapWithMultsExtra, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
16661666
}
16671667

16681668
// produce the full DQ skimmed data model typically for Pb-Pb (with centrality), no subscribtion to the DQ event filter
@@ -1672,7 +1672,7 @@ void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*z
16721672
TrackAssoc const& trackAssocs, FwdTrackAssoc const& fwdTrackAssocs,
16731673
MFTTrackAssoc const& mftAssocs)
16741674
{
1675-
fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, tracksBarrel, muons, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
1675+
fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, tracksBarrel, muons, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
16761676
}
16771677

16781678
// produce the barrel only DQ skimmed data model typically for Pb-Pb (with centrality), no subscribtion to the DQ event filter
@@ -1723,22 +1723,22 @@ void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*z
17231723
void processPbPbMuonOnly(MyEventsWithCentAndMults const& collisions, BCsWithTimestamps const& bcs,
17241724
MyMuonsWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
17251725
{
1726-
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr,nullptr, nullptr, nullptr);
1726+
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
17271727
}
17281728

17291729
// produce the realigned muon only DQ skimmed data model typically for Pb-Pb (with centrality), no subscribtion to the DQ event filter
17301730
void processPbPbRealignedMuonOnly(MyEventsWithCentAndMults const& collisions, BCsWithTimestamps const& bcs,
17311731
MyMuonsRealignWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
17321732
{
1733-
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr,nullptr, nullptr, nullptr);
1733+
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
17341734
}
17351735

17361736
// produce the muon+mft DQ skimmed data model typically for Pb-Pb (with centrality), no subscribtion to the DQ event filter
17371737
void processPbPbMuonMFT(MyEventsWithCentAndMults const& collisions, BCsWithTimestamps const& bcs,
17381738
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
17391739
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
17401740
{
1741-
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr,nullptr, nullptr, nullptr);
1741+
fullSkimming<gkEventFillMapWithCentAndMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
17421742
}
17431743

17441744
// produce the muon+mft DQ skimmed data model typically including MFT covariances
@@ -1747,7 +1747,7 @@ void skimCollisions(TEvents const& collisions, TBCs const& bcs, TZdcs const& /*z
17471747
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs,
17481748
aod::MFTTracksCov const& mftCovs)
17491749
{
1750-
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTCovFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, mftCovs,nullptr, nullptr, nullptr);
1750+
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTCovFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, mftCovs, nullptr, nullptr, nullptr);
17511751
}
17521752

17531753
// Process the BCs and store stats for luminosity retrieval -----------------------------------------------------------------------------------

0 commit comments

Comments
 (0)