From c5b7ce635d9098218faca58efc115ad180d3b87c Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 3 Dec 2024 12:11:10 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 2 +- PWGDQ/DataModel/ReducedInfoTables.h | 18 ++++++++--------- PWGDQ/Tasks/dqEfficiency.cxx | 31 ++++++++++++++++------------- PWGDQ/Tasks/tableReader.cxx | 20 ++++++++++--------- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index b3fc43f0b9a..956eb47f026 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -4531,7 +4531,7 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T //__________________________________________________________________ template -void VarManager::FillQaudMC(T1 const& dilepton, T2 const& track1, T3 const& track2, float* values) +void VarManager::FillQaudMC(T1 const& dilepton, T2 const& track1, T3 const& track2, float* values) { if (!values) { values = fgValues; diff --git a/PWGDQ/DataModel/ReducedInfoTables.h b/PWGDQ/DataModel/ReducedInfoTables.h index b241646e0cf..061cddc3680 100644 --- a/PWGDQ/DataModel/ReducedInfoTables.h +++ b/PWGDQ/DataModel/ReducedInfoTables.h @@ -886,14 +886,14 @@ using DileptonTrackCandidate = DileptonTrackCandidates::iterator; namespace dileptonTrackTrackCandidate { // infotmation about the dilepton-track-track -DECLARE_SOA_COLUMN(Mass, mass, float); //! -DECLARE_SOA_COLUMN(Pt, pt, float); //! -DECLARE_SOA_COLUMN(Eta, eta, float); //! -DECLARE_SOA_COLUMN(Phi, phi, float); //! -DECLARE_SOA_COLUMN(Rap, rap, float); //! -DECLARE_SOA_COLUMN(DeltaQ, deltaQ, float); //! -DECLARE_SOA_COLUMN(R1, r1, float); //! distance between the dilepton and the track1 in theta-phi plane -DECLARE_SOA_COLUMN(R2, r2, float); //! distance between the dilepton and the track2 in theta-phi plane +DECLARE_SOA_COLUMN(Mass, mass, float); //! +DECLARE_SOA_COLUMN(Pt, pt, float); //! +DECLARE_SOA_COLUMN(Eta, eta, float); //! +DECLARE_SOA_COLUMN(Phi, phi, float); //! +DECLARE_SOA_COLUMN(Rap, rap, float); //! +DECLARE_SOA_COLUMN(DeltaQ, deltaQ, float); //! +DECLARE_SOA_COLUMN(R1, r1, float); //! distance between the dilepton and the track1 in theta-phi plane +DECLARE_SOA_COLUMN(R2, r2, float); //! distance between the dilepton and the track2 in theta-phi plane DECLARE_SOA_COLUMN(DileptonMass, dileptonMass, float); //! DECLARE_SOA_COLUMN(DileptonPt, dileptonPt, float); //! DECLARE_SOA_COLUMN(DileptonEta, dileptonEta, float); //! @@ -909,7 +909,7 @@ DECLARE_SOA_COLUMN(TrackPhi1, trackPhi1, float); //! DECLARE_SOA_COLUMN(TrackPhi2, trackPhi2, float); //! DECLARE_SOA_COLUMN(TrackSign1, trackSign1, int); //! DECLARE_SOA_COLUMN(TrackSign2, trackSign2, int); //! -} +} // namespace dileptonTrackTrackCandidate DECLARE_SOA_TABLE(DileptonTrackTrackCandidates, "AOD", "RTDQUADPLET", //! dileptonTrackTrackCandidate::Mass, diff --git a/PWGDQ/Tasks/dqEfficiency.cxx b/PWGDQ/Tasks/dqEfficiency.cxx index e08ea60c984..4ec01d13f0d 100644 --- a/PWGDQ/Tasks/dqEfficiency.cxx +++ b/PWGDQ/Tasks/dqEfficiency.cxx @@ -1359,7 +1359,7 @@ struct AnalysisDileptonTrackTrack { // dilepton cut TString configDileptonCutNamesStr = fConfigDileptonCut.value; fDileptonCut = *dqcuts::GetCompositeCut(configDileptonCutNamesStr.Data()); - + // dilepton-track-track cuts TString configQuadruletCutNamesStr = fConfigQuadrupletCuts.value; std::unique_ptr objArray(configQuadruletCutNamesStr.Tokenize(",")); @@ -1441,7 +1441,8 @@ struct AnalysisDileptonTrackTrack { // Template function to run pair - track - track combinations template - void runDileptonTrackTrack(TEvent const& event, TTracks const& tracks, TDileptons const& dileptons, TEventsMC const& /*eventsMC*/, TTracksMC const& /*tracksMC*/) { + void runDileptonTrackTrack(TEvent const& event, TTracks const& tracks, TDileptons const& dileptons, TEventsMC const& /*eventsMC*/, TTracksMC const& /*tracksMC*/) + { VarManager::ResetValues(0, VarManager::kNVars, fValuesQuadruplet); VarManager::FillEvent(event, fValuesQuadruplet); @@ -1461,7 +1462,8 @@ struct AnalysisDileptonTrackTrack { VarManager::FillTrack(dilepton, fValuesQuadruplet); // apply the dilepton cut - if (!fDileptonCut.IsSelected(fValuesQuadruplet)) continue; + if (!fDileptonCut.IsSelected(fValuesQuadruplet)) + continue; // get the index of the electron legs int indexLepton1 = dilepton.index0Id(); @@ -1474,7 +1476,7 @@ struct AnalysisDileptonTrackTrack { auto lepton1 = tracks.iteratorAt(indexLepton1 - indexOffset); auto lepton2 = tracks.iteratorAt(indexLepton2 - indexOffset); - + auto lepton1MC = lepton1.reducedMCTrack(); auto lepton2MC = lepton2.reducedMCTrack(); @@ -1487,8 +1489,8 @@ struct AnalysisDileptonTrackTrack { } // dilepton combinate with two same particles - if ((fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 1))) || - (!fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 2)))) { + if ((fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 1))) || + (!fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 2)))) { } else { continue; } @@ -1532,17 +1534,18 @@ struct AnalysisDileptonTrackTrack { } } } - } } // end loop over cuts // Fill the DileptonTrackTrackCandidates table - if (!CutDecision) continue; - if (!mcDecision) continue; - DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], - fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], - dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), - fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); + if (!CutDecision) + continue; + if (!mcDecision) + continue; + DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], + fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], + dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), + fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); } // end loop over track - track combinations } // end loop over dileptons }; @@ -1558,7 +1561,7 @@ struct AnalysisDileptonTrackTrack { int daughterIdFirst = track.daughtersIds()[0]; int daughterIdEnd = track.daughtersIds()[1]; int Ndaughters = daughterIdEnd - daughterIdFirst + 1; - if (Ndaughters == 3){ + if (Ndaughters == 3) { auto dilepton = mcTracks.rawIteratorAt(daughterIdFirst); auto track1 = mcTracks.rawIteratorAt(daughterIdFirst + 1); auto track2 = mcTracks.rawIteratorAt(daughterIdFirst + 2); diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 2956235293a..d0e8da18ce1 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -1847,7 +1847,7 @@ struct AnalysisDileptonTrackTrack { // cut name setting TString fTrackCutName1; TString fTrackCutName2; - bool fIsSameTrackCut = false; + bool fIsSameTrackCut = false; AnalysisCompositeCut fDileptonCut; std::vector fQuadrupletCutNames; std::vector fQuadrupletCuts; @@ -1914,7 +1914,8 @@ struct AnalysisDileptonTrackTrack { VarManager::FillTrack(dilepton, fValuesQuadruplet); // apply the dilepton cut - if (!fDileptonCut.IsSelected(fValuesQuadruplet)) continue; + if (!fDileptonCut.IsSelected(fValuesQuadruplet)) + continue; fHistMan->FillHistClass(Form("Dileptons_%s", fDileptonCut.GetName()), fValuesQuadruplet); // get the index of the electron legs @@ -1929,8 +1930,8 @@ struct AnalysisDileptonTrackTrack { } // dilepton combinate with two same particles - if ((fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 1))) || - (!fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 2)))) { + if ((fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 1))) || + (!fIsSameTrackCut && (t1.isBarrelSelected() & (uint32_t(1) << 1)) && (t2.isBarrelSelected() & (uint32_t(1) << 2)))) { } else { continue; } @@ -1964,11 +1965,12 @@ struct AnalysisDileptonTrackTrack { } // loop over dilepton-track-track cuts // table to be written out for ML analysis - if (!CutDecision) continue; - DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], - fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], - dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), - fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); + if (!CutDecision) + continue; + DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], + fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], + dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), + fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); } } }