From 12c4b98c85305084f418cb678a82c032e58317a1 Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Sat, 29 Jun 2024 12:34:52 +0200 Subject: [PATCH 1/8] Fix HistogramRegistry name --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index 5d1a4a9241d..23abc58e666 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -417,21 +417,21 @@ struct phik0shortanalysis { double deltay = std::abs(rapidityPi - rapidityPhi); if constexpr (!isMix) { // same event - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxSameEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); if (deltay > cfgFirstCutonDeltay) continue; - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxSameEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); if (deltay > cfgSecondCutonDeltay) continue; - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxsSameEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxsSameEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); } else { // mixed event - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxMixedEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); if (deltay > cfgFirstCutonDeltay) continue; - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxMixedEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); if (deltay > cfgSecondCutonDeltay) continue; - PhiK0SHist.fill(HIST("h4PhiInvMassPidEdxMixedEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); } } } From ce3ae23d871eb9857e2fae2cc9c16743af7383e2 Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Sun, 30 Jun 2024 12:38:40 +0200 Subject: [PATCH 2/8] Simplified aliases --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 119 ++++++++++----------- 1 file changed, 57 insertions(+), 62 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index 23abc58e666..a3f02dfea5f 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -141,6 +141,35 @@ struct phik0shortanalysis { ConfigurableAxis axisMultiplicityClass{"axisMultiplicityClass", {20, 0, 100}, "multiplicity percentile for bin"}; ConfigurableAxis axisMultiplicity{"axisMultiplicity", {2000, 0, 10000}, "TPC multiplicity for bin"}; + // Constants + double massKa = o2::constants::physics::MassKPlus; + double massPi = o2::constants::physics::MassPiPlus; + + // Defining filters for events (event selection) + // Processed events will be already fulfilling the event selection requirements + Filter eventFilter = (o2::aod::evsel::sel8 == true); + Filter posZFilter = (nabs(o2::aod::collision::posZ) < cutzvertex); + + // Defining filters on V0s (cannot filter on dynamic columns) + Filter preFilterV0 = (nabs(aod::v0data::dcapostopv) > v0setting_dcapostopv && nabs(aod::v0data::dcanegtopv) > v0setting_dcanegtopv && aod::v0data::dcaV0daughters < v0setting_dcav0dau); + + // Defining the type of the collisions for data and MC + using SelCollisions = soa::Join; + using MCCollisions = soa::Join; + + // Defining the type of the tracks + using FullTracks = soa::Join; + + // Defining the type of the V0s + using V0Candidates = soa::Filtered; + + // Defining the binning policy for mixed event + using BinningTypeVertexContributor = ColumnBinningPolicy; + + SliceCache cache; + Partition posTracks = aod::track::signed1Pt > cfgCutCharge; + Partition negTracks = aod::track::signed1Pt < cfgCutCharge; + void init(InitContext const&) { // Axes @@ -215,40 +244,6 @@ struct phik0shortanalysis { PhiPionHist.add("h4PhiInvMassPidEdxMixedEventSecondCut", "Phi Invariant mass vs Pion dE/dx for Mixed Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); } - // Constants - double massKa = o2::constants::physics::MassKPlus; - double massPi = o2::constants::physics::MassPiPlus; - - // Defining filters for events (event selection) - // Processed events will be already fulfilling the event selection requirements - Filter eventFilter = (o2::aod::evsel::sel8 == true); - Filter posZFilter = (nabs(o2::aod::collision::posZ) < cutzvertex); - - // Defining filters on V0s (cannot filter on dynamic columns) - Filter preFilterV0 = (nabs(aod::v0data::dcapostopv) > v0setting_dcapostopv && nabs(aod::v0data::dcanegtopv) > v0setting_dcanegtopv && aod::v0data::dcaV0daughters < v0setting_dcav0dau); - - // Defining the type of the event - using EventCandidates = soa::Join; - - // Defining the type of the Phi daughter tracks - using PhiDaughterCandidates = soa::Join; - - // Defining the type of the V0s - using V0Candidates = soa::Filtered; - - // Defining the type of the V0 daughter tracks - using V0DaughterCandidates = soa::Join; - - // Defining the type of the Pions - using PionCandidates = soa::Join; - - // Defining the binning policy for mixed event - using BinningTypeVertexContributor = ColumnBinningPolicy; - - SliceCache cache; - Partition posTracks = aod::track::signed1Pt > cfgCutCharge; - Partition negTracks = aod::track::signed1Pt < cfgCutCharge; - // Event selection and QA filling template bool acceptEventQA(const T& collision) @@ -436,7 +431,7 @@ struct phik0shortanalysis { } } - void processQAPurity(EventCandidates::iterator const& collision, PhiDaughterCandidates const&, PionCandidates const& Pis, V0Candidates const& V0s, V0DaughterCandidates const&) + void processQAPurity(SelCollisions::iterator const& collision, FullTracks const& fullTracks, V0Candidates const& V0s) { // Check if the event selection is passed if (!acceptEventQA(collision)) @@ -491,8 +486,8 @@ struct phik0shortanalysis { // V0 already reconstructed by the builder for (const auto& v0 : V0s) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) @@ -538,12 +533,12 @@ struct phik0shortanalysis { bool isCountedPiSecondCut = false; // Loop over all primary pion candidates - for (const auto& pi : Pis) { - if (!selectionPion(pi)) + for (const auto& track : fullTracks) { + if (!selectionPion(track)) continue; TLorentzVector recPi; - recPi.SetXYZM(pi.px(), pi.py(), pi.pz(), massPi); + recPi.SetXYZM(track.px(), track.py(), track.pz(), massPi); if (recPi.Rapidity() > 0.8) continue; @@ -568,9 +563,9 @@ struct phik0shortanalysis { } } - PROCESS_SWITCH(phik0shortanalysis, processQAPurity, "Process Same Event for QA and Phi Purities", true); + PROCESS_SWITCH(phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true); - void processSEPhiK0S(soa::Filtered::iterator const& collision, PhiDaughterCandidates const&, V0Candidates const& V0s, V0DaughterCandidates const&) + void processSEPhiK0S(soa::Filtered::iterator const& collision, FullTracks const&, V0Candidates const& V0s) { if (!collision.isInelGt0()) return; @@ -592,8 +587,8 @@ struct phik0shortanalysis { // V0 already reconstructed by the builder for (const auto& v0 : V0s) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) @@ -695,9 +690,9 @@ struct phik0shortanalysis { } } - PROCESS_SWITCH(phik0shortanalysis, processSEPhiK0S, "Process Same Event for Analysis Phi-K0S", false); + PROCESS_SWITCH(phik0shortanalysis, processSEPhiK0S, "Process Same Event for Phi-K0S Analysis", false); - void processSEPhiPion(soa::Filtered::iterator const& collision, PhiDaughterCandidates const&, PionCandidates const& Pis) + void processSEPhiPion(soa::Filtered::iterator const& collision, FullTracks const& fullTracks) { if (!collision.isInelGt0()) return; @@ -710,14 +705,14 @@ struct phik0shortanalysis { auto negThisColl = negTracks->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache); // Loop over all primary pion candidates - for (const auto& pi : Pis) { + for (const auto& track : fullTracks) { // Pion selection - if (!selectionPion(pi)) + if (!selectionPion(track)) continue; TLorentzVector recPi; - recPi.SetXYZM(pi.px(), pi.py(), pi.pz(), massPi); + recPi.SetXYZM(track.px(), track.py(), track.pz(), massPi); if (recPi.Rapidity() > 0.8) continue; @@ -761,13 +756,13 @@ struct phik0shortanalysis { float weightInclusive = 1. / static_cast(countInclusive); float weightLtFirstCut = 1. / static_cast(countLtFirstCut); float weightLtSecondCut = 1. / static_cast(countLtSecondCut); - fillInvMassdEdx(recPi, pi.tpcNSigmaPi(), listrecPhi, multiplicity, weightInclusive, weightLtFirstCut, weightLtSecondCut); + fillInvMassdEdx(recPi, track.tpcNSigmaPi(), listrecPhi, multiplicity, weightInclusive, weightLtFirstCut, weightLtSecondCut); } } - PROCESS_SWITCH(phik0shortanalysis, processSEPhiPion, "Process Same Event for Analysis Phi-Pion", false); + PROCESS_SWITCH(phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false); - void processMEPhiK0S(soa::Filtered const& collisions, PhiDaughterCandidates const&, V0Candidates const& V0s, V0DaughterCandidates const&) + void processMEPhiK0S(soa::Filtered const& collisions, FullTracks const&, V0Candidates const& V0s) { // Mixing the events with similar vertex z and multiplicity BinningTypeVertexContributor binningOnPositions{{axisVertex, axisMultiplicity}, true}; @@ -793,8 +788,8 @@ struct phik0shortanalysis { auto negThisColl = negTracks->sliceByCached(aod::track::collisionId, collision2.globalIndex(), cache); for (const auto& v0 : V0ThisColl) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) @@ -881,9 +876,9 @@ struct phik0shortanalysis { } } - PROCESS_SWITCH(phik0shortanalysis, processMEPhiK0S, "Process Mixed Event for Analysis Phi-K0S", false); + PROCESS_SWITCH(phik0shortanalysis, processMEPhiK0S, "Process Mixed Event for Phi-K0S Analysis", false); - void processMEPhiPion(soa::Filtered const& collisions, PhiDaughterCandidates const&, PionCandidates const& Pis) + void processMEPhiPion(soa::Filtered::iterator const& collision, FullTracks const& fullTracks) { // Mixing the events with similar vertex z and multiplicity BinningTypeVertexContributor binningOnPositions{{axisVertex, axisMultiplicity}, true}; @@ -894,19 +889,19 @@ struct phik0shortanalysis { float multiplicity = collision1.centFT0M(); // Defining V0s from collision1 - auto PiThisColl = Pis.sliceByCached(aod::track::collisionId, collision1.globalIndex(), cache); + auto trackThisColl = fullTracks.sliceByCached(aod::track::collisionId, collision1.globalIndex(), cache); // Defining positive and negative tracks for phi reconstruction from collision1 and collision2, respectively auto posThisColl = posTracks->sliceByCached(aod::track::collisionId, collision1.globalIndex(), cache); auto negThisColl = negTracks->sliceByCached(aod::track::collisionId, collision2.globalIndex(), cache); - for (const auto& pi : PiThisColl) { + for (const auto& track : trackThisColl) { - if (!selectionPion(pi)) + if (!selectionPion(track)) continue; TLorentzVector recPi; - recPi.SetXYZM(pi.px(), pi.py(), pi.pz(), massPi); + recPi.SetXYZM(track.px(), track.py(), track.pz(), massPi); if (recPi.Rapidity() > 0.8) continue; @@ -937,12 +932,12 @@ struct phik0shortanalysis { float weightInclusive = 1. / static_cast(countInclusive); float weightLtFirstCut = 1. / static_cast(countLtFirstCut); float weightLtSecondCut = 1. / static_cast(countLtSecondCut); - fillInvMassdEdx(recPi, pi.tpcNSigmaPi(), listrecPhi, multiplicity, weightInclusive, weightLtFirstCut, weightLtSecondCut); + fillInvMassdEdx(recPi, track.tpcNSigmaPi(), listrecPhi, multiplicity, weightInclusive, weightLtFirstCut, weightLtSecondCut); } } } - PROCESS_SWITCH(phik0shortanalysis, processMEPhiPion, "Process Mixed Event for Analysis Phi-Pion", false); + PROCESS_SWITCH(phik0shortanalysis, processMEPhiPion, "Process Mixed Event for Phi-Pion Analysis", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) From badd8b1ccde111f08600390c39a295fee42f26d4 Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Sun, 30 Jun 2024 13:39:11 +0200 Subject: [PATCH 3/8] Fix --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index a3f02dfea5f..3c8bbe93864 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -878,7 +878,7 @@ struct phik0shortanalysis { PROCESS_SWITCH(phik0shortanalysis, processMEPhiK0S, "Process Mixed Event for Phi-K0S Analysis", false); - void processMEPhiPion(soa::Filtered::iterator const& collision, FullTracks const& fullTracks) + void processMEPhiPion(soa::Filtered const& collisions, FullTracks const& fullTracks) { // Mixing the events with similar vertex z and multiplicity BinningTypeVertexContributor binningOnPositions{{axisVertex, axisMultiplicity}, true}; From 8cd32c04f27a9403632911b28be833307a181cf5 Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Sun, 30 Jun 2024 13:43:07 +0200 Subject: [PATCH 4/8] Fix alias --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index 3c8bbe93864..a7681a05fda 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -155,7 +155,7 @@ struct phik0shortanalysis { // Defining the type of the collisions for data and MC using SelCollisions = soa::Join; - using MCCollisions = soa::Join; + using MCCollisions = soa::Join; // Defining the type of the tracks using FullTracks = soa::Join; From 5ca827291260e883f14bcce593d03c6812d460e5 Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Sun, 30 Jun 2024 14:45:44 +0200 Subject: [PATCH 5/8] Fix histo name --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index a7681a05fda..7cd8db79bd1 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -418,7 +418,7 @@ struct phik0shortanalysis { PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); if (deltay > cfgSecondCutonDeltay) continue; - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxsSameEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); + PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); } else { // mixed event PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); if (deltay > cfgFirstCutonDeltay) From ee63900f5a3a7b97ad2ebb6c9a504cc3bdab9dad Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Mon, 1 Jul 2024 12:04:58 +0200 Subject: [PATCH 6/8] Changed aliases --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index 7cd8db79bd1..1367274b33c 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -157,11 +157,12 @@ struct phik0shortanalysis { using SelCollisions = soa::Join; using MCCollisions = soa::Join; - // Defining the type of the tracks - using FullTracks = soa::Join; - // Defining the type of the V0s - using V0Candidates = soa::Filtered; + using FullV0s = soa::Filtered; + + // Defining the type of the tracks + using FullTracks = soa::Join; + using V0DauTracks = soa::Join; // Defining the binning policy for mixed event using BinningTypeVertexContributor = ColumnBinningPolicy; @@ -431,7 +432,7 @@ struct phik0shortanalysis { } } - void processQAPurity(SelCollisions::iterator const& collision, FullTracks const& fullTracks, V0Candidates const& V0s) + void processQAPurity(SelCollisions::iterator const& collision, FullTracks const& fullTracks, FullV0s const& V0s, V0DauTracks const&) { // Check if the event selection is passed if (!acceptEventQA(collision)) @@ -486,8 +487,8 @@ struct phik0shortanalysis { // V0 already reconstructed by the builder for (const auto& v0 : V0s) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) @@ -565,7 +566,7 @@ struct phik0shortanalysis { PROCESS_SWITCH(phik0shortanalysis, processQAPurity, "Process for QA and Phi Purities", true); - void processSEPhiK0S(soa::Filtered::iterator const& collision, FullTracks const&, V0Candidates const& V0s) + void processSEPhiK0S(soa::Filtered::iterator const& collision, FullTracks const&, FullV0s const& V0s, V0DauTracks const&) { if (!collision.isInelGt0()) return; @@ -587,8 +588,8 @@ struct phik0shortanalysis { // V0 already reconstructed by the builder for (const auto& v0 : V0s) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) @@ -762,7 +763,7 @@ struct phik0shortanalysis { PROCESS_SWITCH(phik0shortanalysis, processSEPhiPion, "Process Same Event for Phi-Pion Analysis", false); - void processMEPhiK0S(soa::Filtered const& collisions, FullTracks const&, V0Candidates const& V0s) + void processMEPhiK0S(soa::Filtered const& collisions, FullTracks const&, FullV0s const& V0s, V0DauTracks const&) { // Mixing the events with similar vertex z and multiplicity BinningTypeVertexContributor binningOnPositions{{axisVertex, axisMultiplicity}, true}; @@ -788,8 +789,8 @@ struct phik0shortanalysis { auto negThisColl = negTracks->sliceByCached(aod::track::collisionId, collision2.globalIndex(), cache); for (const auto& v0 : V0ThisColl) { - const auto& posDaughterTrack = v0.posTrack_as(); - const auto& negDaughterTrack = v0.negTrack_as(); + const auto& posDaughterTrack = v0.posTrack_as(); + const auto& negDaughterTrack = v0.negTrack_as(); // Cut on V0 dynamic columns if (!selectionV0(v0, posDaughterTrack, negDaughterTrack)) From 001b92851af143836a94eea31dda8020d5d7615f Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Mon, 1 Jul 2024 14:32:53 +0200 Subject: [PATCH 7/8] Minor changes --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index 1367274b33c..dee7dda4f69 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -240,9 +240,9 @@ struct phik0shortanalysis { PhiPionHist.add("h4PhiInvMassPidEdxSameEventFirstCut", "Phi Invariant mass vs Pion dE/dx for Same Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); PhiPionHist.add("h4PhiInvMassPidEdxSameEventSecondCut", "Phi Invariant mass vs Pion dE/dx for Same Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); - PhiPionHist.add("h4PhiInvMassPidEdxMixedEventInclusive", "Phi Invariant mass vs Pion dE/dx for Mixed Event Inclusive", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); - PhiPionHist.add("h4PhiInvMassPidEdxMixedEventFirstCut", "Phi Invariant mass vs Pion dE/dx for Mixed Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); - PhiPionHist.add("h4PhiInvMassPidEdxMixedEventSecondCut", "Phi Invariant mass vs Pion dE/dx for Mixed Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxMixedEventInclusive", "Phi Invariant mass vs Pion nSigma dE/dx for Mixed Event Inclusive", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxMixedEventFirstCut", "Phi Invariant mass vs Pion nSigma dE/dx for Mixed Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxMixedEventSecondCut", "Phi Invariant mass vs Pion nSigma dE/dx for Mixed Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); } // Event selection and QA filling @@ -400,9 +400,9 @@ struct phik0shortanalysis { } } - // Fill Phi invariant mass vs Pion dE/dx histogram + // Fill Phi invariant mass vs Pion nSigmadE/dx histogram template - void fillInvMassdEdx(TLorentzVector Pi, float dEdx, const std::vector listPhi, float multiplicity, double weightInclusive, double weightLtFirstCut, double weightLtSecondCut) + void fillInvMassdEdx(TLorentzVector Pi, float nSigmadEdxPi, const std::vector listPhi, float multiplicity, double weightInclusive, double weightLtFirstCut, double weightLtSecondCut) { double rapidityPi = Pi.Rapidity(); double ptPi = Pi.Pt(); @@ -413,21 +413,21 @@ struct phik0shortanalysis { double deltay = std::abs(rapidityPi - rapidityPhi); if constexpr (!isMix) { // same event - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxSameEventInclusive"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightInclusive); if (deltay > cfgFirstCutonDeltay) continue; - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxSameEventFirstCut"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightLtFirstCut); if (deltay > cfgSecondCutonDeltay) continue; - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxSameEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxSameEventSecondCut"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightLtSecondCut); } else { // mixed event - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventInclusive"), multiplicity, ptPi, dEdx, massPhi, weightInclusive); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxMixedEventInclusive"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightInclusive); if (deltay > cfgFirstCutonDeltay) continue; - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventFirstCut"), multiplicity, ptPi, dEdx, massPhi, weightLtFirstCut); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxMixedEventFirstCut"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightLtFirstCut); if (deltay > cfgSecondCutonDeltay) continue; - PhiPionHist.fill(HIST("h4PhiInvMassPidEdxMixedEventSecondCut"), multiplicity, ptPi, dEdx, massPhi, weightLtSecondCut); + PhiPionHist.fill(HIST("h4PhiInvMassPiNSigmadEdxMixedEventSecondCut"), multiplicity, ptPi, nSigmadEdxPi, massPhi, weightLtSecondCut); } } } From 67d657fe5e6b7eac3c2092fcabc0c0173f74560b Mon Sep 17 00:00:00 2001 From: Stefano Cannito Date: Mon, 1 Jul 2024 14:38:14 +0200 Subject: [PATCH 8/8] Min changes --- PWGLF/Tasks/Strangeness/phik0sanalysis.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx index dee7dda4f69..af3450a3e05 100644 --- a/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx +++ b/PWGLF/Tasks/Strangeness/phik0sanalysis.cxx @@ -236,9 +236,9 @@ struct phik0shortanalysis { PhiK0SHist.add("h3PhiK0SInvMassMixedEventSecondCut", "2D Invariant mass of Phi and K0Short for Mixed Event Deltay < SecondCut", kTH3F, {multAxis, K0SmassAxis, PhimassAxis}); // Phi mass vs Pion dE/dx - PhiPionHist.add("h4PhiInvMassPidEdxSameEventInclusive", "Phi Invariant mass vs Pion dE/dx for Same Event Inclusive", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); - PhiPionHist.add("h4PhiInvMassPidEdxSameEventFirstCut", "Phi Invariant mass vs Pion dE/dx for Same Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); - PhiPionHist.add("h4PhiInvMassPidEdxSameEventSecondCut", "Phi Invariant mass vs Pion dE/dx for Same Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxSameEventInclusive", "Phi Invariant mass vs Pion nSigma dE/dx for Same Event Inclusive", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxSameEventFirstCut", "Phi Invariant mass vs Pion nSigma dE/dx for Same Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); + PhiPionHist.add("h4PhiInvMassPiNSigmadEdxSameEventSecondCut", "Phi Invariant mass vs Pion nSigma dE/dx for Same Event Deltay < SecondCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); PhiPionHist.add("h4PhiInvMassPiNSigmadEdxMixedEventInclusive", "Phi Invariant mass vs Pion nSigma dE/dx for Mixed Event Inclusive", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis}); PhiPionHist.add("h4PhiInvMassPiNSigmadEdxMixedEventFirstCut", "Phi Invariant mass vs Pion nSigma dE/dx for Mixed Event Deltay < FirstCut", kTHnSparseF, {multAxis, ptAxis, {100, -10.0f, 10.0f}, PhimassAxis});