Skip to content

Please consider the following formatting changes to #13773 #2

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

Merged
minjungkim12 merged 1 commit into from
Nov 19, 2025
Merged

Please consider the following formatting changes to #13773 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion PWGDQ/Core/VarManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,7 @@ void VarManager::SetDefaultVarNames()
fgVarNamesMap["kBdtBackground"] = kBdtBackground;
fgVarNamesMap["kBdtPrompt"] = kBdtPrompt;
fgVarNamesMap["kBdtNonprompt"] = kBdtNonprompt;
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
fgVariableNames[kAmplitudeFT0A] = "FT0A amplitude";
fgVariableUnits[kAmplitudeFT0A] = "a.u.";
fgVariableNames[kAmplitudeFT0C] = "FT0C amplitude";
fgVariableUnits[kAmplitudeFT0C] = "a.u.";
Expand Down
6 changes: 3 additions & 3 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5909,11 +5909,11 @@ void VarManager::FillFIT(T1 const& bc, T2 const& bcs, T3 const& ft0s, T4 const&
values[kTimeFT0C] = fitInfo.timeFT0C;
values[kTriggerMaskFT0] = static_cast<float>(fitInfo.triggerMaskFT0);
const auto ft0Index = bc.ft0Id();
if(ft0Index < 0 || ft0Index >= ft0s.size()) {
if (ft0Index < 0 || ft0Index >= ft0s.size()) {
values[kNFiredChannelsFT0A] = -1;
values[kNFiredChannelsFT0C] = -1;
} else {
const auto ft0 = ft0s.iteratorAt(ft0Index);
const auto ft0 = ft0s.iteratorAt(ft0Index);
values[kNFiredChannelsFT0A] = ft0.channelA().size();
values[kNFiredChannelsFT0C] = ft0.channelC().size();
}
Expand All @@ -5929,7 +5929,7 @@ void VarManager::FillFIT(T1 const& bc, T2 const& bcs, T3 const& ft0s, T4 const&
values[kTimeFV0A] = fitInfo.timeFV0A;
values[kTriggerMaskFV0A] = static_cast<float>(fitInfo.triggerMaskFV0A);
const auto fv0aIndex = bc.fv0aId();
if(fv0aIndex < 0 || fv0aIndex >= fv0as.size()) {
if (fv0aIndex < 0 || fv0aIndex >= fv0as.size()) {
values[kNFiredChannelsFV0A] = -1;
} else {
const auto fv0a = fv0as.iteratorAt(fv0aIndex);
Expand Down
42 changes: 21 additions & 21 deletions PWGDQ/TableProducer/tableMaker_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,12 +793,12 @@ struct TableMaker {
} // end loop over collisions
}

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

// 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)
void processPPWithFilterBarrelOnly(MyEventsWithMultsAndFilter const& collisions, MyBCs const& bcs, aod::Zdcs& zdcs,
MyBarrelTracksWithCov const& tracksBarrel,
TrackAssoc const& trackAssocs)
{
fullSkimming<gkEventFillMapWithMultsEventFilterZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMultsEventFilterZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
}

// 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)
void processPPWithFilterMuonOnly(MyEventsWithMultsAndFilter const& collisions, BCsWithTimestamps const& bcs,
MyMuonsWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
{
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
}

// 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)
void processPPWithFilterMuonMFT(MyEventsWithMultsAndFilter const& collisions, BCsWithTimestamps const& bcs,
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
{
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMultsAndEventFilter, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
}

// 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
void processPPBarrelOnly(MyEventsWithMults const& collisions, MyBCs const& bcs, aod::Zdcs& zdcs,
MyBarrelTracksWithCov const& tracksBarrel,
TrackAssoc const& trackAssocs)
{
fullSkimming<gkEventFillMapWithMultsZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMultsZdc, gkTrackFillMapWithCov, 0u, 0u>(collisions, bcs, zdcs, tracksBarrel, nullptr, nullptr, trackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
}

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

// 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
void processPPMuonOnly(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
MyMuonsWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
{
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
}

// 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
void processPPRealignedMuonOnly(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
MyMuonsRealignWithCov const& muons, FwdTrackAssoc const& fwdTrackAssocs)
{
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonRealignFillMapWithCov, 0u>(collisions, bcs, nullptr, nullptr, muons, nullptr, nullptr, fwdTrackAssocs, nullptr, nullptr, nullptr, nullptr, nullptr);
}

// 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
void processPPMuonMFT(MyEventsWithMults const& collisions, BCsWithTimestamps const& bcs,
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
{
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMults, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
}

// Central barrel multiplicity estimation
void processPPMuonMFTWithMultsExtra(MyEventsWithMultsExtra const& collisions, BCsWithTimestamps const& bcs,
MyMuonsWithCov const& muons, MFTTracks const& mftTracks,
FwdTrackAssoc const& fwdTrackAssocs, MFTTrackAssoc const& mftAssocs)
{
fullSkimming<gkEventFillMapWithMultsExtra, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr,nullptr,nullptr);
fullSkimming<gkEventFillMapWithMultsExtra, 0u, gkMuonFillMapWithCov, gkMFTFillMap>(collisions, bcs, nullptr, nullptr, muons, mftTracks, nullptr, fwdTrackAssocs, mftAssocs, nullptr, nullptr, nullptr, nullptr);
}

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

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

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

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

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

// Process the BCs and store stats for luminosity retrieval -----------------------------------------------------------------------------------
Expand Down