From c4bdfd2783bc0c11d2c20ab25e08bb58119a8f45 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Thu, 15 Feb 2024 15:11:27 +0100 Subject: [PATCH 01/10] Added Neutral Mass Option --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index 72ff251694b..14763da7567 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -119,6 +119,7 @@ struct kinkAnalysis { Configurable zDiff{"zDiff", 20., "mother-daughter z diff"}; Configurable phiDiff{"phiDiff", 100., "mother-daughter phi diff"}; Configurable cfgIsMC{"cfgIsMC", true, "data or MC"}; + Configurable cfgMassCheck{"cfgMassCheck", false, "check if the reconstructed neutral mass is within 0.1 of the PDG mass"}; o2::base::MatLayerCylSet* lut = nullptr; o2::dataformats::MeanVertexObject* mVtx = nullptr; @@ -730,8 +731,10 @@ struct kinkAnalysis { neutronPabs = sqrt(pow((sigmaPDC[2] - pionPDC[2]), 2) + pow((sigmaPDC[1] - pionPDC[1]), 2) + pow((sigmaPDC[0] - pionPDC[0]), 2)); neutronM = sqrt((sigmaE - pionE) * (sigmaE - pionE) - neutronPabs * neutronPabs); - if (abs(neutronM - mNeutralDaughter) / mNeutralDaughter > 0.1) - continue; + if(cfgMassCheck){ + if (abs(neutronM - mNeutralDaughter) / mNeutralDaughter > 0.1) + continue; + } if ((particleName == SigmaMinus) || (particleName == SigmaPlusToPi)) { if ((theta * radToDeg > (angleCutFunction(particleName, sigmaPabsDC))) && (sigmaPabsDC > 1.6)) From df203d98991a0c31ce9d7124fa1f10865830b961 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Thu, 15 Feb 2024 16:04:46 +0100 Subject: [PATCH 02/10] Format Change --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index 14763da7567..a9c356e1f9c 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -731,7 +731,7 @@ struct kinkAnalysis { neutronPabs = sqrt(pow((sigmaPDC[2] - pionPDC[2]), 2) + pow((sigmaPDC[1] - pionPDC[1]), 2) + pow((sigmaPDC[0] - pionPDC[0]), 2)); neutronM = sqrt((sigmaE - pionE) * (sigmaE - pionE) - neutronPabs * neutronPabs); - if(cfgMassCheck){ + if(cfgMassCheck) { if (abs(neutronM - mNeutralDaughter) / mNeutralDaughter > 0.1) continue; } From 15aea8a4c23583b4d7d65d4b1ae903c296d52778 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Thu, 15 Feb 2024 16:09:02 +0100 Subject: [PATCH 03/10] Formatting --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index a9c356e1f9c..a019f6ff56b 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -731,7 +731,7 @@ struct kinkAnalysis { neutronPabs = sqrt(pow((sigmaPDC[2] - pionPDC[2]), 2) + pow((sigmaPDC[1] - pionPDC[1]), 2) + pow((sigmaPDC[0] - pionPDC[0]), 2)); neutronM = sqrt((sigmaE - pionE) * (sigmaE - pionE) - neutronPabs * neutronPabs); - if(cfgMassCheck) { + if (cfgMassCheck) { if (abs(neutronM - mNeutralDaughter) / mNeutralDaughter > 0.1) continue; } From 4e03bf59e16a19af89a097e166b368dc84e1ad77 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Fri, 16 Feb 2024 17:54:11 +0100 Subject: [PATCH 04/10] Cuts added --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index a019f6ff56b..c6201035261 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -803,6 +803,17 @@ struct kinkAnalysis { mass = sqrt((neutronE + pionE) * (neutronE + pionE) - sigmaPabsDC * sigmaPabsDC); + if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); + + if (particleName == Hypertriton) { + if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) + continue; + if (trackDgh.tpcNClsFound() > 90) + continue; + + histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound()); + } + if (particleName == Hypertriton) { histos.fill(HIST("hHypMass"), mass); histos.fill(HIST("hHypMassPt"), mass, sigmaPt); From f881af9f8bff3d6ded35cff23b096473c05f5909 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Fri, 16 Feb 2024 18:20:19 +0100 Subject: [PATCH 05/10] Minor Change --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index c6201035261..2a0d58230d5 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -342,6 +342,9 @@ struct kinkAnalysis { histos.add("hNSigmaTrVsPt", "hNSigmaTrVsPt", kTH2F, {axisPtHyp, {100, -5, 5, "nSigmaTPC"}}); histos.add("hpRes", "hpRes", kTH2F, {axisPtHyp, {100, -0.5, 0.5, "p_{T} Res"}}); + histos.add("hDCAdaughterMC", "hDCAdaughterMC", kTH1F, {axisDCAdaugh}); + histos.add("tpcClusterTriton", "tpcClusterTriton", kTH1F, {{100, 0, 100, "TPC clusters"}}); + lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get(cfgLUTpath)); ft2.setMaxChi2(5); @@ -803,16 +806,16 @@ struct kinkAnalysis { mass = sqrt((neutronE + pionE) * (neutronE + pionE) - sigmaPabsDC * sigmaPabsDC); - if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); + /*if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); if (particleName == Hypertriton) { if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) continue; - if (trackDgh.tpcNClsFound() > 90) + if (trackDgh.tpcNClsFound() < 90) continue; histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound()); - } + }*/ if (particleName == Hypertriton) { histos.fill(HIST("hHypMass"), mass); From ad7bf0c22820e4ba237556c004f417b2b0111583 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Fri, 16 Feb 2024 18:51:51 +0100 Subject: [PATCH 06/10] Minor Change --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index 2a0d58230d5..dd70abd81c5 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -806,7 +806,7 @@ struct kinkAnalysis { mass = sqrt((neutronE + pionE) * (neutronE + pionE) - sigmaPabsDC * sigmaPabsDC); - /*if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); + if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); if (particleName == Hypertriton) { if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) @@ -815,7 +815,7 @@ struct kinkAnalysis { continue; histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound()); - }*/ + } if (particleName == Hypertriton) { histos.fill(HIST("hHypMass"), mass); From f12558377fe8c0c30ff000772b3db33659602ea9 Mon Sep 17 00:00:00 2001 From: mdiotti Date: Fri, 16 Feb 2024 18:52:42 +0100 Subject: [PATCH 07/10] Formatting --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index dd70abd81c5..ed50d4bb154 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -345,7 +345,6 @@ struct kinkAnalysis { histos.add("hDCAdaughterMC", "hDCAdaughterMC", kTH1F, {axisDCAdaugh}); histos.add("tpcClusterTriton", "tpcClusterTriton", kTH1F, {{100, 0, 100, "TPC clusters"}}); - lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get(cfgLUTpath)); ft2.setMaxChi2(5); ft2.setUseAbsDCA(true); From eba73694b26c833861641d37d2f0e0812632c0cc Mon Sep 17 00:00:00 2001 From: mdiotti Date: Fri, 16 Feb 2024 19:32:21 +0100 Subject: [PATCH 08/10] Minor Changes --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index ed50d4bb154..b07e6c50308 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -343,7 +343,7 @@ struct kinkAnalysis { histos.add("hNSigmaTrVsPt", "hNSigmaTrVsPt", kTH2F, {axisPtHyp, {100, -5, 5, "nSigmaTPC"}}); histos.add("hpRes", "hpRes", kTH2F, {axisPtHyp, {100, -0.5, 0.5, "p_{T} Res"}}); histos.add("hDCAdaughterMC", "hDCAdaughterMC", kTH1F, {axisDCAdaugh}); - histos.add("tpcClusterTriton", "tpcClusterTriton", kTH1F, {{100, 0, 100, "TPC clusters"}}); + histos.add("tpcClusterTriton", "tpcClusterTriton", kTH1F, {{100, 0, 300, "TPC clusters"}}); lut = o2::base::MatLayerCylSet::rectifyPtrFromFile(ccdb->get(cfgLUTpath)); ft2.setMaxChi2(5); @@ -810,10 +810,10 @@ struct kinkAnalysis { if (particleName == Hypertriton) { if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) continue; - if (trackDgh.tpcNClsFound() < 90) - continue; histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound()); + if (trackDgh.tpcNClsFound() < 90) + continue; } if (particleName == Hypertriton) { From 6532ab4a949d6f64cdd23a0fa3e2472dc1bf794a Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 16 Feb 2024 18:35:15 +0000 Subject: [PATCH 09/10] Please consider the following formatting changes --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index b07e6c50308..cdc46e561d5 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -805,10 +805,11 @@ struct kinkAnalysis { mass = sqrt((neutronE + pionE) * (neutronE + pionE) - sigmaPabsDC * sigmaPabsDC); - if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); + if (isDaughter) + histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); if (particleName == Hypertriton) { - if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) + if (trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) continue; histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound()); From 5ba5954ddf1f23db1406a6343db37cbe300962f3 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 16 Feb 2024 18:38:24 +0000 Subject: [PATCH 10/10] MegaLinter fixes --- PWGLF/Tasks/Strangeness/kinkAnalysis.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx index b07e6c50308..cdc46e561d5 100644 --- a/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx +++ b/PWGLF/Tasks/Strangeness/kinkAnalysis.cxx @@ -805,10 +805,11 @@ struct kinkAnalysis { mass = sqrt((neutronE + pionE) * (neutronE + pionE) - sigmaPabsDC * sigmaPabsDC); - if (isDaughter) histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); + if (isDaughter) + histos.fill(HIST("hDCAdaughterMC"), kinkdcaXY); if (particleName == Hypertriton) { - if(trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) + if (trackDgh.tpcNSigmaTr() > 4 || trackDgh.tpcNSigmaTr() < -2) continue; histos.fill(HIST("tpcClusterTriton"), trackDgh.tpcNClsFound());