From e129635b629f354e8134d2c3c9b0e89ecb49289f Mon Sep 17 00:00:00 2001 From: sawan Date: Sat, 20 Dec 2025 21:46:12 +0530 Subject: [PATCH 1/2] added hasTOF condition --- PWGLF/Tasks/Resonances/kstarqa.cxx | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/PWGLF/Tasks/Resonances/kstarqa.cxx b/PWGLF/Tasks/Resonances/kstarqa.cxx index 974d60cdae0..237015a83fe 100644 --- a/PWGLF/Tasks/Resonances/kstarqa.cxx +++ b/PWGLF/Tasks/Resonances/kstarqa.cxx @@ -113,6 +113,10 @@ struct Kstarqa { Configurable cfgITSChi2NCl{"cfgITSChi2NCl", 36.0, "ITS Chi2/NCl"}; Configurable cfgTPCChi2NClMax{"cfgTPCChi2NClMax", 4.0, "TPC Chi2/NCl"}; Configurable cfgTPCChi2NClMin{"cfgTPCChi2NClMin", 0.0, "TPC Chi2/NCl"}; +<<<<<<< HEAD +======= + Configurable hasITS{"hasITS", true, "Required ITS"}; +>>>>>>> 01faa1bf6 (added hasTOF condition) Configurable isITSTPCRefit{"isITSTPCRefit", false, "Require ITS Refit"}; Configurable isVertexITSTPC{"isVertexITSTPC", false, "Vertex ITS TPC"}; Configurable isVertexTOFMatched{"isVertexTOFMatched", false, "Vertex TOF Matched"}; @@ -551,6 +555,11 @@ struct Kstarqa { return false; if (selectionConfig.cfgPVContributor && !candidate.isPVContributor()) return false; +<<<<<<< HEAD +======= + if (selectionConfig.hasITS && !candidate.hasITS()) + return false; +>>>>>>> 01faa1bf6 (added hasTOF condition) if (selectionConfig.isITSTPCRefit && (!(o2::aod::track::ITSrefit) || !(o2::aod::track::TPCrefit))) return false; } else if (!selectionConfig.isGlobalTracks) { @@ -2135,7 +2144,13 @@ struct Kstarqa { hInvMass.fill(HIST("h1RecMult"), multiplicity); hInvMass.fill(HIST("h1RecMult2"), multiplicityRec); +<<<<<<< HEAD hInvMass.fill(HIST("h1RecMult"), multiplicity); +======= + if (cQAevents) { + rEventSelection.fill(HIST("hVertexZRec"), collision.posZ()); + } +>>>>>>> 01faa1bf6 (added hasTOF condition) auto oldindex = -999; for (const auto& track1 : tracks) { @@ -2147,6 +2162,14 @@ struct Kstarqa { continue; } +<<<<<<< HEAD +======= + if (cQAevents) { + rEventSelection.fill(HIST("hDcaxy_cent_pt"), track1.dcaXY(), multiplicity, track1.pt()); + rEventSelection.fill(HIST("hDcaz_cent_pt"), track1.dcaZ(), multiplicity, track1.pt()); + } + +>>>>>>> 01faa1bf6 (added hasTOF condition) auto track1ID = track1.index(); for (const auto& track2 : tracks) { rEventSelection.fill(HIST("recMCparticles"), 0.5); @@ -2188,13 +2211,21 @@ struct Kstarqa { hPID.fill(HIST("Before/hNsigmaTPC_Ka_before"), track2.pt(), track2.tpcNSigmaKa()); hPID.fill(HIST("Before/hNsigmaTOF_Ka_before"), track2.pt(), track2.tofNSigmaKa()); } +<<<<<<< HEAD if (cQAplots && (mctrack2.pdgCode() == -PDG_t::kPiMinus)) { // negative track pion +======= + if (cQAplots && (mctrack2.pdgCode() == PDG_t::kPiMinus)) { // negative track pion +>>>>>>> 01faa1bf6 (added hasTOF condition) hPID.fill(HIST("Before/h1PID_TPC_neg_pion"), track2.tpcNSigmaPi()); hPID.fill(HIST("Before/h1PID_TOF_neg_pion"), track2.tofNSigmaPi()); hPID.fill(HIST("Before/hNsigmaTPC_Pi_before"), track2.pt(), track2.tpcNSigmaPi()); hPID.fill(HIST("Before/hNsigmaTOF_Pi_before"), track2.pt(), track2.tofNSigmaPi()); } +<<<<<<< HEAD if (cQAplots && (mctrack2.pdgCode() == -PDG_t::kKMinus)) { // negative track kaon +======= + if (cQAplots && (mctrack2.pdgCode() == PDG_t::kKMinus)) { // negative track kaon +>>>>>>> 01faa1bf6 (added hasTOF condition) hPID.fill(HIST("Before/h1PID_TPC_neg_kaon"), track2.tpcNSigmaKa()); hPID.fill(HIST("Before/h1PID_TOF_neg_kaon"), track2.tofNSigmaKa()); hPID.fill(HIST("Before/hNsigmaTPC_Ka_before"), track2.pt(), track2.tpcNSigmaKa()); @@ -2203,6 +2234,13 @@ struct Kstarqa { if (cQAplots && (std::abs(mctrack1.pdgCode()) == PDG_t::kKPlus && std::abs(mctrack2.pdgCode()) == PDG_t::kPiPlus)) { hPID.fill(HIST("Before/hNsigma_TPC_TOF_Ka_before"), track1.tpcNSigmaKa(), track1.tofNSigmaKa()); hPID.fill(HIST("Before/hNsigma_TPC_TOF_Pi_before"), track2.tpcNSigmaPi(), track2.tofNSigmaPi()); +<<<<<<< HEAD +======= + hPID.fill(HIST("Before/hTPCnsigKa_mult_pt"), track1.tpcNSigmaKa(), multiplicity, track1.pt()); + hPID.fill(HIST("Before/hTPCnsigPi_mult_pt"), track2.tpcNSigmaPi(), multiplicity, track2.pt()); + hPID.fill(HIST("Before/hTOFnsigKa_mult_pt"), track1.tofNSigmaKa(), multiplicity, track1.pt()); + hPID.fill(HIST("Before/hTOFnsigPi_mult_pt"), track2.tofNSigmaPi(), multiplicity, track2.pt()); +>>>>>>> 01faa1bf6 (added hasTOF condition) } if (!mctrack1.isPhysicalPrimary()) { From a620b3b7611701b341f51b5f499fae4c5ea8352f Mon Sep 17 00:00:00 2001 From: sawan Date: Sat, 20 Dec 2025 21:51:09 +0530 Subject: [PATCH 2/2] clang format fix --- PWGLF/Tasks/Resonances/kstarqa.cxx | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/PWGLF/Tasks/Resonances/kstarqa.cxx b/PWGLF/Tasks/Resonances/kstarqa.cxx index 237015a83fe..4fe14f99429 100644 --- a/PWGLF/Tasks/Resonances/kstarqa.cxx +++ b/PWGLF/Tasks/Resonances/kstarqa.cxx @@ -113,10 +113,7 @@ struct Kstarqa { Configurable cfgITSChi2NCl{"cfgITSChi2NCl", 36.0, "ITS Chi2/NCl"}; Configurable cfgTPCChi2NClMax{"cfgTPCChi2NClMax", 4.0, "TPC Chi2/NCl"}; Configurable cfgTPCChi2NClMin{"cfgTPCChi2NClMin", 0.0, "TPC Chi2/NCl"}; -<<<<<<< HEAD -======= Configurable hasITS{"hasITS", true, "Required ITS"}; ->>>>>>> 01faa1bf6 (added hasTOF condition) Configurable isITSTPCRefit{"isITSTPCRefit", false, "Require ITS Refit"}; Configurable isVertexITSTPC{"isVertexITSTPC", false, "Vertex ITS TPC"}; Configurable isVertexTOFMatched{"isVertexTOFMatched", false, "Vertex TOF Matched"}; @@ -555,11 +552,8 @@ struct Kstarqa { return false; if (selectionConfig.cfgPVContributor && !candidate.isPVContributor()) return false; -<<<<<<< HEAD -======= if (selectionConfig.hasITS && !candidate.hasITS()) return false; ->>>>>>> 01faa1bf6 (added hasTOF condition) if (selectionConfig.isITSTPCRefit && (!(o2::aod::track::ITSrefit) || !(o2::aod::track::TPCrefit))) return false; } else if (!selectionConfig.isGlobalTracks) { @@ -2144,13 +2138,9 @@ struct Kstarqa { hInvMass.fill(HIST("h1RecMult"), multiplicity); hInvMass.fill(HIST("h1RecMult2"), multiplicityRec); -<<<<<<< HEAD - hInvMass.fill(HIST("h1RecMult"), multiplicity); -======= if (cQAevents) { rEventSelection.fill(HIST("hVertexZRec"), collision.posZ()); } ->>>>>>> 01faa1bf6 (added hasTOF condition) auto oldindex = -999; for (const auto& track1 : tracks) { @@ -2162,14 +2152,11 @@ struct Kstarqa { continue; } -<<<<<<< HEAD -======= if (cQAevents) { rEventSelection.fill(HIST("hDcaxy_cent_pt"), track1.dcaXY(), multiplicity, track1.pt()); rEventSelection.fill(HIST("hDcaz_cent_pt"), track1.dcaZ(), multiplicity, track1.pt()); } ->>>>>>> 01faa1bf6 (added hasTOF condition) auto track1ID = track1.index(); for (const auto& track2 : tracks) { rEventSelection.fill(HIST("recMCparticles"), 0.5); @@ -2211,21 +2198,13 @@ struct Kstarqa { hPID.fill(HIST("Before/hNsigmaTPC_Ka_before"), track2.pt(), track2.tpcNSigmaKa()); hPID.fill(HIST("Before/hNsigmaTOF_Ka_before"), track2.pt(), track2.tofNSigmaKa()); } -<<<<<<< HEAD - if (cQAplots && (mctrack2.pdgCode() == -PDG_t::kPiMinus)) { // negative track pion -======= if (cQAplots && (mctrack2.pdgCode() == PDG_t::kPiMinus)) { // negative track pion ->>>>>>> 01faa1bf6 (added hasTOF condition) hPID.fill(HIST("Before/h1PID_TPC_neg_pion"), track2.tpcNSigmaPi()); hPID.fill(HIST("Before/h1PID_TOF_neg_pion"), track2.tofNSigmaPi()); hPID.fill(HIST("Before/hNsigmaTPC_Pi_before"), track2.pt(), track2.tpcNSigmaPi()); hPID.fill(HIST("Before/hNsigmaTOF_Pi_before"), track2.pt(), track2.tofNSigmaPi()); } -<<<<<<< HEAD - if (cQAplots && (mctrack2.pdgCode() == -PDG_t::kKMinus)) { // negative track kaon -======= if (cQAplots && (mctrack2.pdgCode() == PDG_t::kKMinus)) { // negative track kaon ->>>>>>> 01faa1bf6 (added hasTOF condition) hPID.fill(HIST("Before/h1PID_TPC_neg_kaon"), track2.tpcNSigmaKa()); hPID.fill(HIST("Before/h1PID_TOF_neg_kaon"), track2.tofNSigmaKa()); hPID.fill(HIST("Before/hNsigmaTPC_Ka_before"), track2.pt(), track2.tpcNSigmaKa()); @@ -2234,13 +2213,10 @@ struct Kstarqa { if (cQAplots && (std::abs(mctrack1.pdgCode()) == PDG_t::kKPlus && std::abs(mctrack2.pdgCode()) == PDG_t::kPiPlus)) { hPID.fill(HIST("Before/hNsigma_TPC_TOF_Ka_before"), track1.tpcNSigmaKa(), track1.tofNSigmaKa()); hPID.fill(HIST("Before/hNsigma_TPC_TOF_Pi_before"), track2.tpcNSigmaPi(), track2.tofNSigmaPi()); -<<<<<<< HEAD -======= hPID.fill(HIST("Before/hTPCnsigKa_mult_pt"), track1.tpcNSigmaKa(), multiplicity, track1.pt()); hPID.fill(HIST("Before/hTPCnsigPi_mult_pt"), track2.tpcNSigmaPi(), multiplicity, track2.pt()); hPID.fill(HIST("Before/hTOFnsigKa_mult_pt"), track1.tofNSigmaKa(), multiplicity, track1.pt()); hPID.fill(HIST("Before/hTOFnsigPi_mult_pt"), track2.tofNSigmaPi(), multiplicity, track2.pt()); ->>>>>>> 01faa1bf6 (added hasTOF condition) } if (!mctrack1.isPhysicalPrimary()) {