From 43b5dfa79f4d6a45726c604b502feb0aa9bf7367 Mon Sep 17 00:00:00 2001 From: nepeivodaRS Date: Fri, 23 Jun 2023 23:08:19 +0200 Subject: [PATCH 1/6] BranchInit 1. Mult axis 2. TPC pt axis 3. FIx Nevents precision bug 4. Nch vs Signal in FT0M/FV0A --- PWGLF/TableProducer/cascqaanalysis.cxx | 36 ++++++++++++++++++++----- PWGLF/Tasks/cascpostprocessing.cxx | 37 ++++++++++++++------------ 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/PWGLF/TableProducer/cascqaanalysis.cxx b/PWGLF/TableProducer/cascqaanalysis.cxx index 29e0108f0dc..174a4a62790 100644 --- a/PWGLF/TableProducer/cascqaanalysis.cxx +++ b/PWGLF/TableProducer/cascqaanalysis.cxx @@ -45,7 +45,9 @@ struct cascqaanalysis { AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; - AxisSpec centFT0MAxis = {100, 0.0f, 100.0f, "FT0M (%)"}; + ConfigurableAxis centFT0MAxis{"FT0M", + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FT0M (%)"}; void init(InitContext const&) { @@ -53,7 +55,7 @@ struct cascqaanalysis { TString hNEventsMCLabels[4] = {"All", "z vrtx", "INEL>0", "Associated with rec. collision"}; TString hNEventsLabels[4] = {"All", "sel8", "z vrtx", "INEL>0"}; - registry.add("hNEvents", "hNEvents", {HistType::kTH1I, {{4, 0.f, 4.f}}}); + registry.add("hNEvents", "hNEvents", {HistType::kTH1F, {{4, 0.f, 4.f}}}); for (Int_t n = 1; n <= registry.get(HIST("hNEvents"))->GetNbinsX(); n++) { registry.get(HIST("hNEvents"))->GetXaxis()->SetBinLabel(n, hNEventsLabels[n - 1]); } @@ -87,6 +89,8 @@ struct cascqaanalysis { registry.add("hDCAz_AfterCut", "hDCAz_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAz"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_BefCut", "hDCAxy_BefCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_AfterCut", "hDCAxy_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); + registry.add("hNchMultFT0M", "hNchMultFT0M", HistType::kTH2F, {{10000, 0.f, 10000.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); + registry.add("hNchMultFV0A", "hNchMultFV0A", HistType::kTH2F, {{10000, 0.f, 10000.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); } // Event selection criteria @@ -181,6 +185,11 @@ struct cascqaanalysis { return true; } + template + bool isPrimaryTrack(TTrack track){ + return (TMath::Abs(track.dcaXY()) < (maxDCANsigmaScaling * (DCASigma + DCAPtScaling / track.pt()))) && (TMath::Abs(track.dcaZ()) < maxDCAz); + } + template bool isINELgt0(TTracks tracks, bool isFillEventSelectionQA) { @@ -193,9 +202,9 @@ struct cascqaanalysis { registry.fill(HIST("hDCAxy_BefCut"), track.dcaXY(), track.pt()); registry.fill(HIST("hDCAz_BefCut"), track.dcaZ(), track.pt()); - if (TMath::Abs(track.dcaXY()) > (maxDCANsigmaScaling * (DCASigma + DCAPtScaling / track.pt())) || TMath::Abs(track.dcaZ()) > maxDCAz) { + if(!isPrimaryTrack(track)){ nRejTracks++; - continue; // consider only primaries + continue; // consider only primaries } TracksEta[nTracks++] = track.eta(); @@ -264,6 +273,19 @@ struct cascqaanalysis { } } + template + void fillMultHisto(TCollision const& collision, TTracks const& tracks) + { + double Nch = 0; + for (const auto& track : tracks) { + if(TMath::Abs(track.eta()) > 0.5) continue; + if(!isPrimaryTrack(track)) continue; + Nch++; + } + registry.fill(HIST("hNchMultFT0M"), Nch, collision.multZeqFT0A() + collision.multZeqFT0C()); + registry.fill(HIST("hNchMultFV0A"), Nch, collision.multZeqFV0A()); + } + void processData(soa::Join::iterator const& collision, soa::Filtered const& Cascades, aod::V0sLinked const&, @@ -333,7 +355,7 @@ struct cascqaanalysis { PROCESS_SWITCH(cascqaanalysis, processData, "Process Run 3 data", true); - void processMCrec(soa::Join::iterator const& collision, + void processMCrec(soa::Join::iterator const& collision, soa::Filtered const& Cascades, aod::V0sLinked const&, aod::V0Datas const&, @@ -344,6 +366,8 @@ struct cascqaanalysis { return; } + fillMultHisto(collision, Tracks); + float lEventScale = scalefactor; for (const auto& casc : Cascades) { // loop over Cascades @@ -398,7 +422,7 @@ struct cascqaanalysis { } // Fill table if (fRand->Rndm() < lEventScale) { - mycascades(casc.globalIndex(), collision.posZ(), collision.centFT0M(), collision.centFV0A(), casc.sign(), casc.pt(), casc.yXi(), casc.yOmega(), casc.eta(), + mycascades(casc.globalIndex(), collision.posZ(), collision.multZeqFT0A() + collision.multZeqFT0C(), collision.multZeqFV0A(), casc.sign(), casc.pt(), casc.yXi(), casc.yOmega(), casc.eta(), casc.mXi(), casc.mOmega(), casc.mLambda(), casc.cascradius(), casc.v0radius(), casc.casccosPA(collision.posX(), collision.posY(), collision.posZ()), casc.v0cosPA(collision.posX(), collision.posY(), collision.posZ()), casc.dcapostopv(), casc.dcanegtopv(), casc.dcabachtopv(), casc.dcacascdaughters(), casc.dcaV0daughters(), casc.dcav0topv(collision.posX(), collision.posY(), collision.posZ()), diff --git a/PWGLF/Tasks/cascpostprocessing.cxx b/PWGLF/Tasks/cascpostprocessing.cxx index 03dee50593f..c37a1ba791b 100644 --- a/PWGLF/Tasks/cascpostprocessing.cxx +++ b/PWGLF/Tasks/cascpostprocessing.cxx @@ -161,10 +161,13 @@ struct cascpostprocessing { if (!isXi) massAxis = omegamassAxis; AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; - AxisSpec pTPCAxis = {100, 0.0f, 10.0f, "#it{p} TPC (GeV/#it{c})"}; AxisSpec etaAxis = {200, -2.0f, 2.0f, "#eta"}; - AxisSpec centFT0MAxis = {100, 0.0f, 100.0f, "FT0M (%)"}; - AxisSpec centFV0AAxis = {100, 0.0f, 100.0f, "FV0A (%)"}; + ConfigurableAxis centFT0MAxis{"FT0M", + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FT0M (%)"}; + ConfigurableAxis centFV0AAxis{"FV0A", + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FV0A (%)"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; AxisSpec phiAxis = {100, -TMath::Pi() / 2, 3. * TMath::Pi() / 2, "#varphi"}; @@ -253,12 +256,12 @@ struct cascpostprocessing { registry.add("hCtauPlus", "hCtauPlus", {HistType::kTH1F, {{100, 0.0f, 40.0f}}}); // daughter tracks - registry.add("hTPCNSigmaPosPi", "hTPCNSigmaPosPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaNegPi", "hTPCNSigmaNegPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaPosPr", "hTPCNSigmaPosPr", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaNegPr", "hTPCNSigmaNegPr", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaBachPi", "hTPCNSigmaBachPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaBachKa", "hTPCNSigmaBachKa", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaPosPi", "hTPCNSigmaPosPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaNegPi", "hTPCNSigmaNegPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaPosPr", "hTPCNSigmaPosPr", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaNegPr", "hTPCNSigmaNegPr", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaBachPi", "hTPCNSigmaBachPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaBachKa", "hTPCNSigmaBachKa", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaPosPi", "hTOFNSigmaPosPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaNegPi", "hTOFNSigmaNegPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaPosPr", "hTOFNSigmaPosPr", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); @@ -460,24 +463,24 @@ struct cascpostprocessing { } if (isCandidate) { if (candidate.sign() < 0) { - registry.fill(HIST("hTPCNSigmaPosPr"), candidate.ntpcsigmapospr()); - registry.fill(HIST("hTPCNSigmaNegPi"), candidate.ntpcsigmanegpi()); + registry.fill(HIST("hTPCNSigmaPosPr"), candidate.pt(), candidate.ntpcsigmapospr()); + registry.fill(HIST("hTPCNSigmaNegPi"), candidate.pt(), candidate.ntpcsigmanegpi()); registry.fill(HIST("hTOFNSigmaPosPr"), candidate.ntofsigmapospr()); registry.fill(HIST("hTOFNSigmaNegPi"), candidate.ntofsigmanegpi()); registry.fill(HIST("hCascMinusEtaPos"), candidate.poseta()); registry.fill(HIST("hCascMinusEtaNeg"), candidate.negeta()); registry.fill(HIST("hCascMinusEtaBach"), candidate.bacheta()); } else { - registry.fill(HIST("hTPCNSigmaPosPi"), candidate.ntpcsigmapospi()); - registry.fill(HIST("hTPCNSigmaNegPr"), candidate.ntpcsigmanegpr()); + registry.fill(HIST("hTPCNSigmaPosPi"), candidate.pt(), candidate.ntpcsigmapospi()); + registry.fill(HIST("hTPCNSigmaNegPr"), candidate.pt(), candidate.ntpcsigmanegpr()); registry.fill(HIST("hTOFNSigmaPosPi"), candidate.ntofsigmapospi()); registry.fill(HIST("hTOFNSigmaNegPr"), candidate.ntofsigmanegpr()); } if (isXi) { - registry.fill(HIST("hTPCNSigmaBachPi"), candidate.ntpcsigmabachpi()); + registry.fill(HIST("hTPCNSigmaBachPi"), candidate.pt(), candidate.ntpcsigmabachpi()); registry.fill(HIST("hTOFNSigmaBachPi"), candidate.ntofsigmabachpi()); } else { - registry.fill(HIST("hTPCNSigmaBachKa"), candidate.ntpcsigmabachka()); + registry.fill(HIST("hTPCNSigmaBachKa"), candidate.pt(), candidate.ntpcsigmabachka()); registry.fill(HIST("hTOFNSigmaBachKa"), candidate.ntofsigmabachka()); } } @@ -490,7 +493,7 @@ struct cascpostprocessing { registry.fill(HIST("hPtCascMinusTrueRec"), candidate.pt(), rapidity, (isFT0MforMC ? candidate.multFT0M() : 0)); } registry.fill(HIST("hCascMinusInvMassvsPt"), candidate.pt(), invmass); - registry.fill(HIST("hCascMinusInvMassvsPt_FT0M"), candidate.multFT0M(), candidate.pt(), invmass); + registry.fill(HIST("hCascMinusInvMassvsPt_FT0M"), isFT0MforMC ? candidate.multFT0M() : 0, candidate.pt(), invmass); registry.fill(HIST("hCascMinusInvMassvsPt_FV0A"), candidate.multFV0A(), candidate.pt(), invmass); } if (candidate.sign() > 0) { @@ -498,7 +501,7 @@ struct cascpostprocessing { registry.fill(HIST("hPtCascPlusTrueRec"), candidate.pt(), rapidity, (isFT0MforMC ? candidate.multFT0M() : 0)); } registry.fill(HIST("hCascPlusInvMassvsPt"), candidate.pt(), invmass); - registry.fill(HIST("hCascPlusInvMassvsPt_FT0M"), candidate.multFT0M(), candidate.pt(), invmass); + registry.fill(HIST("hCascPlusInvMassvsPt_FT0M"), isFT0MforMC ? candidate.multFT0M() : 0, candidate.pt(), invmass); registry.fill(HIST("hCascPlusInvMassvsPt_FV0A"), candidate.multFV0A(), candidate.pt(), invmass); } } From 9287765380eb289cbad7e9a007458832cb69676d Mon Sep 17 00:00:00 2001 From: nepeivodaRS Date: Sat, 24 Jun 2023 17:27:12 +0200 Subject: [PATCH 2/6] Upd Mult and Cut hists --- PWGLF/TableProducer/cascqaanalysis.cxx | 12 ++++++------ PWGLF/Tasks/cascpostprocessing.cxx | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PWGLF/TableProducer/cascqaanalysis.cxx b/PWGLF/TableProducer/cascqaanalysis.cxx index 174a4a62790..ddf4b00aea1 100644 --- a/PWGLF/TableProducer/cascqaanalysis.cxx +++ b/PWGLF/TableProducer/cascqaanalysis.cxx @@ -89,8 +89,8 @@ struct cascqaanalysis { registry.add("hDCAz_AfterCut", "hDCAz_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAz"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_BefCut", "hDCAxy_BefCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_AfterCut", "hDCAxy_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); - registry.add("hNchMultFT0M", "hNchMultFT0M", HistType::kTH2F, {{10000, 0.f, 10000.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); - registry.add("hNchMultFV0A", "hNchMultFV0A", HistType::kTH2F, {{10000, 0.f, 10000.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); + registry.add("hNchMultFT0M", "hNchMultFT0M", HistType::kTH2F, {{150, 0.f, 150.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); + registry.add("hNchMultFV0A", "hNchMultFV0A", HistType::kTH2F, {{150, 0.f, 150.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FV0A signal"}}); } // Event selection criteria @@ -282,8 +282,8 @@ struct cascqaanalysis { if(!isPrimaryTrack(track)) continue; Nch++; } - registry.fill(HIST("hNchMultFT0M"), Nch, collision.multZeqFT0A() + collision.multZeqFT0C()); - registry.fill(HIST("hNchMultFV0A"), Nch, collision.multZeqFV0A()); + registry.fill(HIST("hNchMultFT0M"), Nch, collision.multFT0A() + collision.multFT0C()); + registry.fill(HIST("hNchMultFV0A"), Nch, collision.multFV0A()); } void processData(soa::Join::iterator const& collision, @@ -355,7 +355,7 @@ struct cascqaanalysis { PROCESS_SWITCH(cascqaanalysis, processData, "Process Run 3 data", true); - void processMCrec(soa::Join::iterator const& collision, + void processMCrec(soa::Join::iterator const& collision, soa::Filtered const& Cascades, aod::V0sLinked const&, aod::V0Datas const&, @@ -422,7 +422,7 @@ struct cascqaanalysis { } // Fill table if (fRand->Rndm() < lEventScale) { - mycascades(casc.globalIndex(), collision.posZ(), collision.multZeqFT0A() + collision.multZeqFT0C(), collision.multZeqFV0A(), casc.sign(), casc.pt(), casc.yXi(), casc.yOmega(), casc.eta(), + mycascades(casc.globalIndex(), collision.posZ(), collision.multFT0A() + collision.multFT0C(), collision.multFV0A(), casc.sign(), casc.pt(), casc.yXi(), casc.yOmega(), casc.eta(), casc.mXi(), casc.mOmega(), casc.mLambda(), casc.cascradius(), casc.v0radius(), casc.casccosPA(collision.posX(), collision.posY(), collision.posZ()), casc.v0cosPA(collision.posX(), collision.posY(), collision.posZ()), casc.dcapostopv(), casc.dcanegtopv(), casc.dcabachtopv(), casc.dcacascdaughters(), casc.dcaV0daughters(), casc.dcav0topv(collision.posX(), collision.posY(), collision.posZ()), diff --git a/PWGLF/Tasks/cascpostprocessing.cxx b/PWGLF/Tasks/cascpostprocessing.cxx index c37a1ba791b..cb122a5e789 100644 --- a/PWGLF/Tasks/cascpostprocessing.cxx +++ b/PWGLF/Tasks/cascpostprocessing.cxx @@ -231,10 +231,10 @@ struct cascpostprocessing { registry.add("hDCANegToPV", "hDCANegToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); registry.add("hDCAPosToPV", "hDCAPosToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); registry.add("hDCABachToPV", "hDCABachToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); - registry.add("hCascCosPA", "hCascCosPA", {HistType::kTH1F, {{100, 0.9f, 1.0f}}}); - registry.add("hV0CosPA", "hV0CosPA", {HistType::kTH1F, {{100, 0.9f, 1.0f}}}); - registry.add("hCascRadius", "hCascRadius", {HistType::kTH1D, {{500, 0.0f, 50.0f}}}); - registry.add("hV0Radius", "hV0Radius", {HistType::kTH1D, {{500, 0.0f, 50.0f}}}); + registry.add("hCascCosPA", "hCascCosPA", {HistType::kTH2F, {ptAxis, {100, 0.9f, 1.0f}}}); + registry.add("hV0CosPA", "hV0CosPA", {HistType::kTH2F, {ptAxis, {100, 0.9f, 1.0f}}}); + registry.add("hCascRadius", "hCascRadius", {HistType::kTH2D, {ptAxis, {500, 0.0f, 50.0f}}}); + registry.add("hV0Radius", "hV0Radius", {HistType::kTH2D, {ptAxis, {500, 0.0f, 50.0f}}}); registry.add("hDCACascDaughters", "hDCACascDaughters", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); registry.add("hDCAV0Daughters", "hDCAV0Daughters", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); registry.add("hDCAV0ToPV", "hDCAV0ToPV", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); @@ -425,10 +425,10 @@ struct cascpostprocessing { registry.fill(HIST("hDCANegToPV"), candidate.dcanegtopv()); registry.fill(HIST("hDCAPosToPV"), candidate.dcapostopv()); registry.fill(HIST("hDCABachToPV"), candidate.dcabachtopv()); - registry.fill(HIST("hCascCosPA"), candidate.casccospa()); - registry.fill(HIST("hV0CosPA"), candidate.v0cospa()); - registry.fill(HIST("hCascRadius"), candidate.cascradius()); - registry.fill(HIST("hV0Radius"), candidate.v0radius()); + registry.fill(HIST("hCascCosPA"), candidate.pt(), candidate.casccospa()); + registry.fill(HIST("hV0CosPA"), candidate.pt(), candidate.v0cospa()); + registry.fill(HIST("hCascRadius"), candidate.pt(), candidate.cascradius()); + registry.fill(HIST("hV0Radius"), candidate.pt(), candidate.v0radius()); registry.fill(HIST("hDCACascDaughters"), candidate.dcacascdaughters()); registry.fill(HIST("hDCAV0Daughters"), candidate.dcav0daughters()); registry.fill(HIST("hDCAV0ToPV"), candidate.dcav0topv()); From 44af51ce0823bbc2b1182858792f2bce43c9dd83 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Sat, 24 Jun 2023 15:27:48 +0000 Subject: [PATCH 3/6] Please consider the following formatting changes --- PWGLF/TableProducer/cascqaanalysis.cxx | 17 ++++++++++------- PWGLF/Tasks/cascpostprocessing.cxx | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/PWGLF/TableProducer/cascqaanalysis.cxx b/PWGLF/TableProducer/cascqaanalysis.cxx index ddf4b00aea1..325f846ea0f 100644 --- a/PWGLF/TableProducer/cascqaanalysis.cxx +++ b/PWGLF/TableProducer/cascqaanalysis.cxx @@ -46,8 +46,8 @@ struct cascqaanalysis { AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; ConfigurableAxis centFT0MAxis{"FT0M", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, - "FT0M (%)"}; + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FT0M (%)"}; void init(InitContext const&) { @@ -186,7 +186,8 @@ struct cascqaanalysis { } template - bool isPrimaryTrack(TTrack track){ + bool isPrimaryTrack(TTrack track) + { return (TMath::Abs(track.dcaXY()) < (maxDCANsigmaScaling * (DCASigma + DCAPtScaling / track.pt()))) && (TMath::Abs(track.dcaZ()) < maxDCAz); } @@ -202,9 +203,9 @@ struct cascqaanalysis { registry.fill(HIST("hDCAxy_BefCut"), track.dcaXY(), track.pt()); registry.fill(HIST("hDCAz_BefCut"), track.dcaZ(), track.pt()); - if(!isPrimaryTrack(track)){ + if (!isPrimaryTrack(track)) { nRejTracks++; - continue; // consider only primaries + continue; // consider only primaries } TracksEta[nTracks++] = track.eta(); @@ -278,8 +279,10 @@ struct cascqaanalysis { { double Nch = 0; for (const auto& track : tracks) { - if(TMath::Abs(track.eta()) > 0.5) continue; - if(!isPrimaryTrack(track)) continue; + if (TMath::Abs(track.eta()) > 0.5) + continue; + if (!isPrimaryTrack(track)) + continue; Nch++; } registry.fill(HIST("hNchMultFT0M"), Nch, collision.multFT0A() + collision.multFT0C()); diff --git a/PWGLF/Tasks/cascpostprocessing.cxx b/PWGLF/Tasks/cascpostprocessing.cxx index cb122a5e789..dcc9e6eb723 100644 --- a/PWGLF/Tasks/cascpostprocessing.cxx +++ b/PWGLF/Tasks/cascpostprocessing.cxx @@ -163,11 +163,11 @@ struct cascpostprocessing { AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec etaAxis = {200, -2.0f, 2.0f, "#eta"}; ConfigurableAxis centFT0MAxis{"FT0M", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, - "FT0M (%)"}; + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FT0M (%)"}; ConfigurableAxis centFV0AAxis{"FV0A", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, - "FV0A (%)"}; + {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + "FV0A (%)"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; AxisSpec phiAxis = {100, -TMath::Pi() / 2, 3. * TMath::Pi() / 2, "#varphi"}; From fb64c9454cfb93e4ad8122668991cd7a8f89eca1 Mon Sep 17 00:00:00 2001 From: nepeivodaRS Date: Mon, 26 Jun 2023 11:01:33 +0200 Subject: [PATCH 4/6] del isFT0MforMC for rec. hists --- PWGLF/Tasks/cascpostprocessing.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGLF/Tasks/cascpostprocessing.cxx b/PWGLF/Tasks/cascpostprocessing.cxx index dcc9e6eb723..bc54fde53cc 100644 --- a/PWGLF/Tasks/cascpostprocessing.cxx +++ b/PWGLF/Tasks/cascpostprocessing.cxx @@ -493,7 +493,7 @@ struct cascpostprocessing { registry.fill(HIST("hPtCascMinusTrueRec"), candidate.pt(), rapidity, (isFT0MforMC ? candidate.multFT0M() : 0)); } registry.fill(HIST("hCascMinusInvMassvsPt"), candidate.pt(), invmass); - registry.fill(HIST("hCascMinusInvMassvsPt_FT0M"), isFT0MforMC ? candidate.multFT0M() : 0, candidate.pt(), invmass); + registry.fill(HIST("hCascMinusInvMassvsPt_FT0M"), candidate.multFT0M(), candidate.pt(), invmass); registry.fill(HIST("hCascMinusInvMassvsPt_FV0A"), candidate.multFV0A(), candidate.pt(), invmass); } if (candidate.sign() > 0) { @@ -501,7 +501,7 @@ struct cascpostprocessing { registry.fill(HIST("hPtCascPlusTrueRec"), candidate.pt(), rapidity, (isFT0MforMC ? candidate.multFT0M() : 0)); } registry.fill(HIST("hCascPlusInvMassvsPt"), candidate.pt(), invmass); - registry.fill(HIST("hCascPlusInvMassvsPt_FT0M"), isFT0MforMC ? candidate.multFT0M() : 0, candidate.pt(), invmass); + registry.fill(HIST("hCascPlusInvMassvsPt_FT0M"), candidate.multFT0M(), candidate.pt(), invmass); registry.fill(HIST("hCascPlusInvMassvsPt_FV0A"), candidate.multFV0A(), candidate.pt(), invmass); } } From dbb0a2bc7a3261b7d4fadacceecaf2604e0cbc1e Mon Sep 17 00:00:00 2001 From: nepeivodaRS Date: Thu, 29 Jun 2023 00:48:56 +0200 Subject: [PATCH 5/6] Upd 1. Implement Chiara's suggestions 2. hNAssocCollisions 3. hNContributorsCorrelation for the case when there're 2 rec. collisions for the 1 gen. --- PWGLF/TableProducer/cascqaanalysis.cxx | 39 ++++++++++------ PWGLF/Tasks/cascpostprocessing.cxx | 64 +++++++++++++------------- 2 files changed, 59 insertions(+), 44 deletions(-) diff --git a/PWGLF/TableProducer/cascqaanalysis.cxx b/PWGLF/TableProducer/cascqaanalysis.cxx index 325f846ea0f..1d1900ca4ad 100644 --- a/PWGLF/TableProducer/cascqaanalysis.cxx +++ b/PWGLF/TableProducer/cascqaanalysis.cxx @@ -45,9 +45,9 @@ struct cascqaanalysis { AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; - ConfigurableAxis centFT0MAxis{"FT0M", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, - "FT0M (%)"}; + ConfigurableAxis centAxis{"FT0M", + {VARIABLE_WIDTH, 0., 0.01, 0.05, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}, + "FT0M (%)"}; void init(InitContext const&) { @@ -59,18 +59,20 @@ struct cascqaanalysis { for (Int_t n = 1; n <= registry.get(HIST("hNEvents"))->GetNbinsX(); n++) { registry.get(HIST("hNEvents"))->GetXaxis()->SetBinLabel(n, hNEventsLabels[n - 1]); } + registry.add("hNAssocCollisions", "hNAssocCollisions", {HistType::kTH1F, {{5, -0.5f, 4.5f}}}); + registry.add("hNContributorsCorrelation", "hNContributorsCorrelation", {HistType::kTH2F, {{250, -0.5f, 249.5f, "Secondary Contributor"}, {250, -0.5f, 249.5f, "Main Contributor"}}}); registry.add("hZCollision", "hZCollision", {HistType::kTH1F, {{200, -20.f, 20.f}}}); registry.add("hZCollisionGen", "hZCollisionGen", {HistType::kTH1F, {{200, -20.f, 20.f}}}); registry.add("hCentFT0M", "hCentFT0M", {HistType::kTH1F, {{1000, 0.f, 100.f}}}); registry.add("hCentFV0A", "hCentFV0A", {HistType::kTH1F, {{1000, 0.f, 100.f}}}); - registry.add("hPtXiPlusTrue", "hPtXiPlusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtXiMinusTrue", "hPtXiMinusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtOmegaPlusTrue", "hPtOmegaPlusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtOmegaMinusTrue", "hPtOmegaMinusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtXiPlusTrueAssoiciatedWithSelColl", "hPtXiPlusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtXiMinusTrueAssoiciatedWithSelColl", "hPtXiMinusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtOmegaPlusTrueAssoiciatedWithSelColl", "hPtOmegaPlusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); - registry.add("hPtOmegaMinusTrueAssoiciatedWithSelColl", "hPtOmegaMinusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centFT0MAxis}}); + registry.add("hPtXiPlusTrue", "hPtXiPlusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtXiMinusTrue", "hPtXiMinusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtOmegaPlusTrue", "hPtOmegaPlusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtOmegaMinusTrue", "hPtOmegaMinusTrue", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtXiPlusTrueAssoiciatedWithSelColl", "hPtXiPlusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtXiMinusTrueAssoiciatedWithSelColl", "hPtXiMinusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtOmegaPlusTrueAssoiciatedWithSelColl", "hPtOmegaPlusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); + registry.add("hPtOmegaMinusTrueAssoiciatedWithSelColl", "hPtOmegaMinusTrueAssoiciatedWithSelColl", {HistType::kTH3F, {ptAxis, rapidityAxis, centAxis}}); registry.add("hNEventsMC", "hNEventsMC", {HistType::kTH1F, {{4, 0.0f, 4.0f}}}); for (Int_t n = 1; n <= registry.get(HIST("hNEventsMC"))->GetNbinsX(); n++) { @@ -89,8 +91,8 @@ struct cascqaanalysis { registry.add("hDCAz_AfterCut", "hDCAz_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAz"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_BefCut", "hDCAxy_BefCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); registry.add("hDCAxy_AfterCut", "hDCAxy_AfterCut", HistType::kTH2F, {{400, -0.2, 0.2, "DCAxy"}, {150, 0.0, 15.0, "p_{T} (GeV/c)"}}); - registry.add("hNchMultFT0M", "hNchMultFT0M", HistType::kTH2F, {{150, 0.f, 150.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); - registry.add("hNchMultFV0A", "hNchMultFV0A", HistType::kTH2F, {{150, 0.f, 150.f, "N_{ch}"}, {10000, 0.f, 10000.f, "FV0A signal"}}); + registry.add("hNchMultFT0M", "hNchMultFT0M", HistType::kTH2F, {{300, 0.0f, 300.0f, "N_{ch}"}, {10000, 0.f, 10000.f, "FT0M signal"}}); + registry.add("hNchMultFV0A", "hNchMultFV0A", HistType::kTH2F, {{300, 0.0f, 300.0f, "N_{ch}"}, {15000, 0.f, 15000.f, "FV0A signal"}}); } // Event selection criteria @@ -483,14 +485,25 @@ struct cascqaanalysis { } std::vector SelectedEvents(collisions.size()); + std::vector NumberOfContributors; int nevts = 0; + int nAssocColl = 0; for (const auto& collision : collisions) { if (!AcceptEvent(collision, Tracks, 0)) { continue; } SelectedEvents[nevts++] = collision.mcCollision_as().globalIndex(); + if(collision.mcCollision_as().globalIndex() == mcCollision.globalIndex()) { + nAssocColl++; + NumberOfContributors.push_back(collision.numContrib()); + } } SelectedEvents.resize(nevts); + registry.fill(HIST("hNAssocCollisions"), nAssocColl); + if(NumberOfContributors.size() == 2) { + std::sort(NumberOfContributors.begin(), NumberOfContributors.end()); + registry.fill(HIST("hNContributorsCorrelation"), NumberOfContributors[0], NumberOfContributors[1]); + } const auto evtReconstructedAndSelected = std::find(SelectedEvents.begin(), SelectedEvents.end(), mcCollision.globalIndex()) != SelectedEvents.end(); // at least 1 selected reconstructed event has the same global index as mcCollision diff --git a/PWGLF/Tasks/cascpostprocessing.cxx b/PWGLF/Tasks/cascpostprocessing.cxx index bc54fde53cc..ece0adec4c4 100644 --- a/PWGLF/Tasks/cascpostprocessing.cxx +++ b/PWGLF/Tasks/cascpostprocessing.cxx @@ -161,12 +161,14 @@ struct cascpostprocessing { if (!isXi) massAxis = omegamassAxis; AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; + AxisSpec ptAxisTopoVar = {50, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; + AxisSpec ptAxisPID = {50, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec etaAxis = {200, -2.0f, 2.0f, "#eta"}; ConfigurableAxis centFT0MAxis{"FT0M", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + {VARIABLE_WIDTH, 0., 0.01, 0.05, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}, "FT0M (%)"}; ConfigurableAxis centFV0AAxis{"FV0A", - {VARIABLE_WIDTH, 0., 0.01, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 50, 70, 100}, + {VARIABLE_WIDTH, 0., 0.01, 0.05, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}, "FV0A (%)"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; AxisSpec phiAxis = {100, -TMath::Pi() / 2, 3. * TMath::Pi() / 2, "#varphi"}; @@ -228,20 +230,20 @@ struct cascpostprocessing { registry.add("hOmegaPlusInvMassvsPt_BefSels", "hOmegaPlusInvMassvsPt_BefSels", {HistType::kTH2F, {ptAxis, omegamassAxis}}); // topo - registry.add("hDCANegToPV", "hDCANegToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); - registry.add("hDCAPosToPV", "hDCAPosToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); - registry.add("hDCABachToPV", "hDCABachToPV", {HistType::kTH1F, {{200, -1.0f, 1.0f}}}); - registry.add("hCascCosPA", "hCascCosPA", {HistType::kTH2F, {ptAxis, {100, 0.9f, 1.0f}}}); - registry.add("hV0CosPA", "hV0CosPA", {HistType::kTH2F, {ptAxis, {100, 0.9f, 1.0f}}}); - registry.add("hCascRadius", "hCascRadius", {HistType::kTH2D, {ptAxis, {500, 0.0f, 50.0f}}}); - registry.add("hV0Radius", "hV0Radius", {HistType::kTH2D, {ptAxis, {500, 0.0f, 50.0f}}}); - registry.add("hDCACascDaughters", "hDCACascDaughters", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); - registry.add("hDCAV0Daughters", "hDCAV0Daughters", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); - registry.add("hDCAV0ToPV", "hDCAV0ToPV", {HistType::kTH1F, {{55, 0.0f, 2.20f}}}); - registry.add("hMassLambdaDau", "hMassLambdaDau", {HistType::kTH1F, {{60, 1.1f, 1.13f}}}); - - registry.add("hBachBaryonCosPA", "hBachBaryonCosPA", {HistType::kTH1F, {{100, 0.0f, 1.0f}}}); - registry.add("hBachBaryonDCAxyToPV", "hBachBaryonDCAxyToPV", {HistType::kTH1F, {{300, -3.0f, 3.0f}}}); + registry.add("hDCANegToPV", "hDCANegToPV", {HistType::kTH2F, {ptAxisTopoVar, {200, -1.0f, 1.0f}}}); + registry.add("hDCAPosToPV", "hDCAPosToPV", {HistType::kTH2F, {ptAxisTopoVar, {200, -1.0f, 1.0f}}}); + registry.add("hDCABachToPV", "hDCABachToPV", {HistType::kTH2F, {ptAxisTopoVar, {200, -1.0f, 1.0f}}}); + registry.add("hCascCosPA", "hCascCosPA", {HistType::kTH2F, {ptAxisTopoVar, {100, 0.9f, 1.0f}}}); + registry.add("hV0CosPA", "hV0CosPA", {HistType::kTH2F, {ptAxisTopoVar, {100, 0.9f, 1.0f}}}); + registry.add("hCascRadius", "hCascRadius", {HistType::kTH2D, {ptAxisTopoVar, {500, 0.0f, 50.0f}}}); + registry.add("hV0Radius", "hV0Radius", {HistType::kTH2D, {ptAxisTopoVar, {500, 0.0f, 50.0f}}}); + registry.add("hDCACascDaughters", "hDCACascDaughters", {HistType::kTH2F, {ptAxisTopoVar, {55, 0.0f, 2.20f}}}); + registry.add("hDCAV0Daughters", "hDCAV0Daughters", {HistType::kTH2F, {ptAxisTopoVar, {55, 0.0f, 2.20f}}}); + registry.add("hDCAV0ToPV", "hDCAV0ToPV", {HistType::kTH2F, {ptAxisTopoVar, {55, 0.0f, 2.20f}}}); + registry.add("hMassLambdaDau", "hMassLambdaDau", {HistType::kTH2F, {ptAxis, {60, 1.1f, 1.13f}}}); + + registry.add("hBachBaryonCosPA", "hBachBaryonCosPA", {HistType::kTH2F, {ptAxisTopoVar, {100, 0.0f, 1.0f}}}); + registry.add("hBachBaryonDCAxyToPV", "hBachBaryonDCAxyToPV", {HistType::kTH2F, {ptAxisTopoVar, {300, -3.0f, 3.0f}}}); // kine registry.add("hEtaMinus", "hEtaMinus", {HistType::kTH2F, {ptAxis, etaAxis}}); @@ -256,12 +258,12 @@ struct cascpostprocessing { registry.add("hCtauPlus", "hCtauPlus", {HistType::kTH1F, {{100, 0.0f, 40.0f}}}); // daughter tracks - registry.add("hTPCNSigmaPosPi", "hTPCNSigmaPosPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaNegPi", "hTPCNSigmaNegPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaPosPr", "hTPCNSigmaPosPr", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaNegPr", "hTPCNSigmaNegPr", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaBachPi", "hTPCNSigmaBachPi", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); - registry.add("hTPCNSigmaBachKa", "hTPCNSigmaBachKa", {HistType::kTH2F, {ptAxis, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaPosPi", "hTPCNSigmaPosPi", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaNegPi", "hTPCNSigmaNegPi", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaPosPr", "hTPCNSigmaPosPr", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaNegPr", "hTPCNSigmaNegPr", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaBachPi", "hTPCNSigmaBachPi", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); + registry.add("hTPCNSigmaBachKa", "hTPCNSigmaBachKa", {HistType::kTH2F, {ptAxisPID, {120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaPosPi", "hTOFNSigmaPosPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaNegPi", "hTOFNSigmaNegPi", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); registry.add("hTOFNSigmaPosPr", "hTOFNSigmaPosPr", {HistType::kTH1F, {{120, -6.0f, 6.0f}}}); @@ -422,20 +424,20 @@ struct cascpostprocessing { registry.fill(HIST("hCandidate"), ++counter); registry.fill(HIST("hPt"), candidate.pt()); - registry.fill(HIST("hDCANegToPV"), candidate.dcanegtopv()); - registry.fill(HIST("hDCAPosToPV"), candidate.dcapostopv()); - registry.fill(HIST("hDCABachToPV"), candidate.dcabachtopv()); + registry.fill(HIST("hDCANegToPV"), candidate.pt(), candidate.dcanegtopv()); + registry.fill(HIST("hDCAPosToPV"), candidate.pt(), candidate.dcapostopv()); + registry.fill(HIST("hDCABachToPV"), candidate.pt(), candidate.dcabachtopv()); registry.fill(HIST("hCascCosPA"), candidate.pt(), candidate.casccospa()); registry.fill(HIST("hV0CosPA"), candidate.pt(), candidate.v0cospa()); registry.fill(HIST("hCascRadius"), candidate.pt(), candidate.cascradius()); registry.fill(HIST("hV0Radius"), candidate.pt(), candidate.v0radius()); - registry.fill(HIST("hDCACascDaughters"), candidate.dcacascdaughters()); - registry.fill(HIST("hDCAV0Daughters"), candidate.dcav0daughters()); - registry.fill(HIST("hDCAV0ToPV"), candidate.dcav0topv()); - registry.fill(HIST("hMassLambdaDau"), candidate.masslambdadau()); + registry.fill(HIST("hDCACascDaughters"), candidate.pt(), candidate.dcacascdaughters()); + registry.fill(HIST("hDCAV0Daughters"), candidate.pt(), candidate.dcav0daughters()); + registry.fill(HIST("hDCAV0ToPV"), candidate.pt(), candidate.dcav0topv()); + registry.fill(HIST("hMassLambdaDau"), candidate.pt(), candidate.masslambdadau()); - registry.fill(HIST("hBachBaryonCosPA"), candidate.bachBaryonCosPA()); - registry.fill(HIST("hBachBaryonDCAxyToPV"), candidate.bachBaryonDCAxyToPV()); + registry.fill(HIST("hBachBaryonCosPA"), candidate.pt(), candidate.bachBaryonCosPA()); + registry.fill(HIST("hBachBaryonDCAxyToPV"), candidate.pt(), candidate.bachBaryonDCAxyToPV()); if (candidate.sign() > 0) { registry.fill(HIST("hCtauPlus"), ctau); registry.fill(HIST("hEtaPlus"), candidate.pt(), candidate.eta()); From ad99c07f8989ee3a9fe1d84327a96b434722547d Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 28 Jun 2023 22:50:02 +0000 Subject: [PATCH 6/6] Please consider the following formatting changes --- PWGLF/TableProducer/cascqaanalysis.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGLF/TableProducer/cascqaanalysis.cxx b/PWGLF/TableProducer/cascqaanalysis.cxx index 1d1900ca4ad..9ae20f7d62b 100644 --- a/PWGLF/TableProducer/cascqaanalysis.cxx +++ b/PWGLF/TableProducer/cascqaanalysis.cxx @@ -46,8 +46,8 @@ struct cascqaanalysis { AxisSpec ptAxis = {200, 0.0f, 10.0f, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec rapidityAxis = {200, -2.0f, 2.0f, "y"}; ConfigurableAxis centAxis{"FT0M", - {VARIABLE_WIDTH, 0., 0.01, 0.05, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}, - "FT0M (%)"}; + {VARIABLE_WIDTH, 0., 0.01, 0.05, 0.1, 0.5, 1, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}, + "FT0M (%)"}; void init(InitContext const&) { @@ -493,14 +493,14 @@ struct cascqaanalysis { continue; } SelectedEvents[nevts++] = collision.mcCollision_as().globalIndex(); - if(collision.mcCollision_as().globalIndex() == mcCollision.globalIndex()) { + if (collision.mcCollision_as().globalIndex() == mcCollision.globalIndex()) { nAssocColl++; NumberOfContributors.push_back(collision.numContrib()); } } SelectedEvents.resize(nevts); registry.fill(HIST("hNAssocCollisions"), nAssocColl); - if(NumberOfContributors.size() == 2) { + if (NumberOfContributors.size() == 2) { std::sort(NumberOfContributors.begin(), NumberOfContributors.end()); registry.fill(HIST("hNContributorsCorrelation"), NumberOfContributors[0], NumberOfContributors[1]); }