From b6df5325a6bcc4edd0fdb51438b98186042bae26 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 9 Nov 2026 22:33:31 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 12 ++++----- PWGDQ/Tasks/tableReader_withAssoc.h | 42 +++++++++++++++-------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 0d71b3f679b..99c049374e8 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -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+ @@ -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; diff --git a/PWGDQ/Tasks/tableReader_withAssoc.h b/PWGDQ/Tasks/tableReader_withAssoc.h index 0c844f876bc..a9399212765 100644 --- a/PWGDQ/Tasks/tableReader_withAssoc.h +++ b/PWGDQ/Tasks/tableReader_withAssoc.h @@ -2581,7 +2581,7 @@ struct AnalysisSameEventPairing { fAmbiguousPairs[iPair] = static_cast(1) << icut; } } - + if (sign1 * sign2 < 0) { if (fConfigNRotations.value == 1) { VarManager::FillPairRotation(t1, t2, fConfigNRotations.value); @@ -3250,13 +3250,15 @@ struct AnalysisSameEventPairing { void processBarrelOnlyDiKaons(MyEventsVtxCovSelected const& events, o2::soa::Join const& barrelAssocs, - MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) { + MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) + { runSameEventPairing(events, trackAssocsPerCollision, barrelAssocs, barrelTracks); } void processBarrelOnlyDiProtons(MyEventsVtxCovSelected const& events, o2::soa::Join const& barrelAssocs, - MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) { + MyBarrelTracksWithCovWithAmbiguities const& barrelTracks) + { runSameEventPairing(events, trackAssocsPerCollision, barrelAssocs, barrelTracks); } @@ -4900,12 +4902,12 @@ struct AnalysisDileptonTrackTrack { uint32_t fNDoubletCuts = 0; // number of doublet track cuts std::vector fDoubletCutNames; std::vector> fDoubletCutMasks; - + AnalysisCompositeCut fDileptonCut{}; bool fApplyDileptonCut = false; std::vector fQuadrupletCutNames; std::vector fQuadrupletCuts; - uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts + uint32_t fNQuadrupletCuts = 0; // number of quadruplet track cuts o2::framework::Service fCCDB{}; @@ -4967,7 +4969,7 @@ struct AnalysisDileptonTrackTrack { } } std::unique_ptr 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 doubletTrackSelections(trackCutsStr.Tokenize(",")); @@ -4988,7 +4990,7 @@ struct AnalysisDileptonTrackTrack { } uint32_t mask2 = (static_cast(1) << trackSelectionsUpstream->IndexOf(obj)); - fTrackCutMask1 |= mask1; + fTrackCutMask1 |= mask1; fTrackCutMask2 |= mask2; fDoubletCutMasks.push_back(std::make_pair(mask1, mask2)); fDoubletCutNames.push_back(cutName); @@ -5008,7 +5010,7 @@ struct AnalysisDileptonTrackTrack { fApplyDileptonCut = true; fDileptonCut = *o2::aod::dqcuts::GetCompositeCut(configDileptonCutNamesStr.Data()); } - + TString configQuadruletCutNamesStr = fConfigQuadrupletCuts.value; std::unique_ptr objArray(configQuadruletCutNamesStr.Tokenize(",")); for (Int_t icut = 0; icut < objArray->GetEntries(); ++icut) { @@ -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()); @@ -5087,7 +5089,7 @@ struct AnalysisDileptonTrackTrack { continue; } VarManager::FillTrack(dilepton, fValuesQuadruplet); - + // apply the dilepton cut if (fApplyDileptonCut && !fDileptonCut.IsSelected(fValuesQuadruplet)) { continue; @@ -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