Skip to content

[PWGDQ] Please consider the following formatting changes to #18673 #36

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
iarsene merged 1 commit into from
Nov 9, 2026
Merged

[PWGDQ] Please consider the following formatting changes to #18673 #36

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
12 changes: 6 additions & 6 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ class VarManager : public TObject

enum PairCandidateType {
// TODO: need to agree on a scheme to incorporate all various hypotheses (e.g. e - mu, jpsi - K+, Jpsi - pipi,...)
kDecayToEE = 0, // e.g. J/psi -> e+ e-
kDecayToMuMu, // e.g. J/psi -> mu+ mu-
kDecayToPiPi, // decay channel to pi+ pi-
kDecayToKchKch, // decay channel to K+ K-
kDecayToPrAPr, // decay channel to p+ p-
kDecayToEE = 0, // e.g. J/psi -> e+ e-
kDecayToMuMu, // e.g. J/psi -> mu+ mu-
kDecayToPiPi, // decay channel to pi+ pi-
kDecayToKchKch, // decay channel to K+ K-
kDecayToPrAPr, // decay channel to p+ p-
kElectronMuon, // e.g. Electron - muon correlations
kBcToThreeMuons, // e.g. Bc -> mu+ mu- mu+
kBtoJpsiEEK, // e.g. B+ -> e+ e- K+
Expand Down Expand Up @@ -3843,7 +3843,7 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values)
m1 = o2::constants::physics::MassPionCharged;
m2 = o2::constants::physics::MassPionCharged;
}

if constexpr (pairType == kDecayToKchKch) {
m1 = o2::constants::physics::MassKaonCharged;
m2 = o2::constants::physics::MassKaonCharged;
Expand Down
42 changes: 22 additions & 20 deletions PWGDQ/Tasks/tableReader_withAssoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,7 +2581,7 @@ struct AnalysisSameEventPairing {
fAmbiguousPairs[iPair] = static_cast<uint32_t>(1) << icut;
}
}

if (sign1 * sign2 < 0) {
if (fConfigNRotations.value == 1) {
VarManager::FillPairRotation<TPairType, TTrackFillMap>(t1, t2, fConfigNRotations.value);
Expand Down Expand Up @@ -3250,13 +3250,15 @@ struct AnalysisSameEventPairing {

void processBarrelOnlyDiKaons(MyEventsVtxCovSelected const& events,
o2::soa::Join<o2::aod::ReducedTracksAssoc, o2::aod::BarrelTrackCuts, o2::aod::Prefilter> const& barrelAssocs,
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) {
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
{
runSameEventPairing<true, VarManager::kDecayToKchKch, gkEventFillMapWithCov, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
}

void processBarrelOnlyDiProtons(MyEventsVtxCovSelected const& events,
o2::soa::Join<o2::aod::ReducedTracksAssoc, o2::aod::BarrelTrackCuts, o2::aod::Prefilter> const& barrelAssocs,
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) {
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks)
{
runSameEventPairing<true, VarManager::kDecayToPrAPr, gkEventFillMapWithCov, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
}

Expand Down Expand Up @@ -4900,12 +4902,12 @@ struct AnalysisDileptonTrackTrack {
uint32_t fNDoubletCuts = 0; // number of doublet track cuts
std::vector<TString> fDoubletCutNames;
std::vector<std::pair<uint32_t, uint32_t>> fDoubletCutMasks;

AnalysisCompositeCut fDileptonCut{};
bool fApplyDileptonCut = false;
std::vector<TString> fQuadrupletCutNames;
std::vector<AnalysisCompositeCut> fQuadrupletCuts;
uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts
uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts

o2::framework::Service<o2::ccdb::BasicCCDBManager> fCCDB{};

Expand Down Expand Up @@ -4967,7 +4969,7 @@ struct AnalysisDileptonTrackTrack {
}
}
std::unique_ptr<TObjArray> trackSelectionsUpstream(tempCutsStr.Tokenize(","));

// interpret the list of track cuts and build the filter mask for each of the two prongs
TString trackCutsStr = fConfigTrackCuts.value;
std::unique_ptr<TObjArray> doubletTrackSelections(trackCutsStr.Tokenize(","));
Expand All @@ -4988,7 +4990,7 @@ struct AnalysisDileptonTrackTrack {
}
uint32_t mask2 = (static_cast<uint32_t>(1) << trackSelectionsUpstream->IndexOf(obj));

fTrackCutMask1 |= mask1;
fTrackCutMask1 |= mask1;
fTrackCutMask2 |= mask2;
fDoubletCutMasks.push_back(std::make_pair(mask1, mask2));
fDoubletCutNames.push_back(cutName);
Expand All @@ -5008,7 +5010,7 @@ struct AnalysisDileptonTrackTrack {
fApplyDileptonCut = true;
fDileptonCut = *o2::aod::dqcuts::GetCompositeCut(configDileptonCutNamesStr.Data());
}

TString configQuadruletCutNamesStr = fConfigQuadrupletCuts.value;
std::unique_ptr<TObjArray> objArray(configQuadruletCutNamesStr.Tokenize(","));
for (Int_t icut = 0; icut < objArray->GetEntries(); ++icut) {
Expand Down Expand Up @@ -5038,7 +5040,7 @@ struct AnalysisDileptonTrackTrack {
if (fNQuadrupletCuts == 0) {
DefineHistograms(fHistMan, Form("QuadrupletSEPM_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
if (fDoubletCutMasks[idcut].first != fDoubletCutMasks[idcut].second) {
DefineHistograms(fHistMan, Form("QuadrupletSEMP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
DefineHistograms(fHistMan, Form("QuadrupletSEMP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
}
DefineHistograms(fHistMan, Form("QuadrupletSEPP_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
DefineHistograms(fHistMan, Form("QuadrupletSEMM_%s", fDoubletCutNames[idcut].Data()), fConfigAddQuadrupletHistogram.value.data());
Expand Down Expand Up @@ -5087,7 +5089,7 @@ struct AnalysisDileptonTrackTrack {
continue;
}
VarManager::FillTrack<fgDileptonFillMap>(dilepton, fValuesQuadruplet);

// apply the dilepton cut
if (fApplyDileptonCut && !fDileptonCut.IsSelected(fValuesQuadruplet)) {
continue;
Expand Down Expand Up @@ -5161,34 +5163,34 @@ struct AnalysisDileptonTrackTrack {
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
}
} else {
if ((track1.sign() < 0) && (track2.sign() > 0)) {
if ((track1.sign() < 0) && (track2.sign() > 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEMP_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
}
}
if ((track1.sign() > 0) && (track2.sign() > 0)) {
if ((track1.sign() > 0) && (track2.sign() > 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEPP_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEMM_%s_%s", fDoubletCutNames[iDoubletCut].Data(), fQuadrupletCutNames[iQuadrupletCut].Data()), fValuesQuadruplet);
}
}
} // end of loop over quadruplet cuts
} // end of loop over quadruplet cuts
// in case there are no quadruplet cuts specified by the user
if (isSameTrackCut) {
if (track1.sign() * track2.sign() < 0) {
if (track1.sign() * track2.sign() < 0) {
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
}
} else {
if ((track1.sign() < 0) && (track2.sign() > 0)) {
if ((track1.sign() < 0) && (track2.sign() > 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEMP_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
} else if ((track1.sign() > 0) && (track2.sign() < 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEPM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
}
}
if ((track1.sign() > 0) && (track2.sign() > 0)) {
if ((track1.sign() > 0) && (track2.sign() > 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEPP_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
} else if ((track1.sign() < 0) && (track2.sign() < 0)) {
fHistMan->FillHistClass(Form("QuadrupletSEMM_%s", fDoubletCutNames[iDoubletCut].Data()), fValuesQuadruplet);
}
} // end of loop over doublet cuts
Expand Down
Loading