From bf7e0fab92e36aeff823afabe96dead92e639b79 Mon Sep 17 00:00:00 2001 From: Thor Jensen Date: Mon, 18 Nov 2024 14:12:44 +0100 Subject: [PATCH 01/24] test --- .../Tasks/CMakeLists.txt | 10 + .../Tasks/CorrSparse.cxx | 197 ++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index f6742441246..fd68848641e 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -47,3 +47,13 @@ o2physics_add_dpl_workflow(twopartcorr-per-run-extraqc SOURCES perRunExtraQc.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore O2Physics::AnalysisCCDB COMPONENT_NAME Analysis) + +o2physics_add_dpl_workflow(corrsparses + SOURCES CorrSparse.cxx + PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore +O2Physics::PWGCFCore + COMPONENT_NAME Analysis) + + + + diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx new file mode 100644 index 00000000000..3674fd08890 --- /dev/null +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -0,0 +1,197 @@ +#include "Framework/runDataProcessing.h" +#include "Framework/AnalysisTask.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/ASoAHelpers.h" +#include "Framework/HistogramRegistry.h" +#include "Framework/RunningWorkflowInfo.h" +#include "CommonConstants/MathConstants.h" +#include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/TrackSelectionTables.h" +#include "Common/DataModel/Centrality.h" +#include "PWGCF/Core/CorrelationContainer.h" +#include "PWGCF/Core/PairCuts.h" + +#include "TList.h" +#include +#include +#include +#include "TMath.h" +#include + + +namespace o2::aod +{ +namespace hash +{ +DECLARE_SOA_COLUMN(Bin, bin, int); +} // namespace hash +DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin); + +using Hash = Hashes::iterator; +} // namespace o2::aod + +using namespace o2; +using namespace o2::framework; +using namespace o2::framework::expressions; + +int s = 1; // same event +int m = 2; // mixed event + +struct CorrSparse { + Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; + Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; + Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; + Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; + Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; + Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; + Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; + + Configurable cfgCutChi2prTPCcls = {"chi2cut", 2.5, "Chi2 cut. Default 2.5"}; + + + + ConfigurableAxis axisVertex{"axisVertex", {7, -7, 7}, "vertex axis for histograms"}; + ConfigurableAxis axisDeltaPhi{"axisDeltaPhi", {72, -constants::math::PIHalf, constants::math::PIHalf * 3}, "delta phi axis for histograms"}; + ConfigurableAxis axisDeltaEta{"axisDeltaEta", {40, -2, 2}, "delta eta axis for histograms"}; + ConfigurableAxis axisPtTrigger{"axisPtTrigger", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt trigger axis for histograms"}; + ConfigurableAxis axisPtAssoc{"axisPtAssoc", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0,10.0}, "pt associated axis for histograms"}; + ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10,15,20,25,30,35,40,50,60,80,100 }, "multiplicity / centrality axis for histograms"}; + + HistogramRegistry registry{"registry"}; + int logcolls = 0; + int logcollpairs = 0; + + void init(InitContext&) + { + LOGF(info, "Starting init"); + registry.add("Yield", "pT vs eta vs Nch", {HistType::kTH3F, { {40, 0, 20, "p_{T}"}, {100, -2, 2, "#eta"}, {100, 0, 100, "Nch"}}}); // check to see total number of tracks + registry.add("etaphi_Trigger", "eta vs phi vs Nch", {HistType::kTH3F, { {100, -2, 2, "#eta"}, {200, 0, 2 * M_PI, "#varphi"}, {100, 0, 100, "Nch"}}}); + + registry.add("deltaEta_deltaPhi_same", "", {HistType::kTH2D,{axisDeltaPhi, axisDeltaEta}}); //check to see the delta eta and delta phi distribution + registry.add("deltaEta_deltaPhi_mixed", "", {HistType::kTH2D ,{axisDeltaPhi, axisDeltaEta}}); + + registry.add("Sparse_mixed", "", {HistType::kTHnSparseD,{{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); // Make the output sparse + registry.add("Sparse_same", "", {HistType::kTHnSparseD,{{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); + + const int maxMixBin = axisMultiplicity->size() * axisVertex->size(); + registry.add("eventcount", "bin", {HistType::kTH1F,{{maxMixBin + 2, -2.5, -0.5 + maxMixBin, "bin"}}}); //histogram to see how many events are in the same and mixed event + } + + + template + void fillYield(TCollision collision, float centrality, TTracks tracks) // function to fill the yield and etaphi histograms. (This is not needed can be removed) + { + for (auto& track1 : tracks) { + registry.fill(HIST("Yield"), track1.pt(), track1.eta(), track1.size()); + registry.fill(HIST("etaphi_Trigger"), track1.size(),track1.phi(), track1.eta()); + } + } + + template < typename TCollision> + bool fillCollision(TCollision collision, float centrality) + { + + if (!collision.sel8()) { + return false; + } + + return true; + } + + +template < typename TTracks> +void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, float Nch) // function to fill the Output functions (sparse) and the delta eta and delta phi histograms + { + // loop over all tracks + for (auto& track1 : tracks1) { + + for (auto& track2 : tracks2) { + if (track1 == track2) { + continue; + } + + float deltaPhi = track1.phi() - track2.phi(); + float deltaEta = track1.eta() - track2.eta(); + if (deltaPhi > 1.5f * PI) { + deltaPhi -= TwoPI; + } + if (deltaPhi < -PIHalf) { + deltaPhi += TwoPI; + } + + // fill the right sparse and histograms + if (system == 1) { + registry.fill(HIST("deltaEta_deltaPhi_same"), deltaPhi, deltaEta); + registry.fill(HIST("Sparse_same"), posZ, track1.pt(), track2.pt(), Nch, deltaPhi, deltaEta); + } else if (system == 2) { + registry.fill(HIST("deltaEta_deltaPhi_mixed"), deltaPhi, deltaEta); + registry.fill(HIST("Sparse_mixed"), posZ, track1.pt(), track2.pt(), Nch, deltaPhi, deltaEta); + } + } + } + } + +//make the filters and cuts. I was told not to include chi2 and dca cuts since they are not needed for run 3 data. + + Filter collisionFilter = nabs(aod::collision::posZ) < cfgZVtxCut; + + Filter trackFilter = (nabs(aod::track::eta) < cfgEtaCut) && (aod::track::pt > cfgPtCutMin) && (aod::track::pt < cfgPtCutMax) + && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) + //&& (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls) + && (nabs(aod::track::dcaZ) > cfgDCAzCut) + && (cfgDCAxySigmaCut * (0.0015f+0.005f/npow(aod::track::pt,1.1f)) < nabs(aod::track::dcaXY)); + // + + // define the filtered collisions and tracks +using aodCollisions = soa::Filtered>; + using aodTracks = soa::Filtered>; + + +// process for the same event +void processSame(aodCollisions::iterator const& collision, aodTracks const& tracks) + { + const auto centrality = collision.centFT0C(); + + registry.fill(HIST("eventcount"), -2); //because its same event i put it in the -2 bin + fillYield(collision, centrality, tracks); + fillCorrelations( tracks, tracks, collision.posZ(), 1,tracks.size()); // fill the SE histogram and Sparse + } + PROCESS_SWITCH(CorrSparse, processSame, "Process same event", true); + + + +// i do the event mixing (i have not changed this from the tutorial i got). + std::vector vtxBinsEdges{VARIABLE_WIDTH, -7.0f, -5.0f, -3.0f, -1.0f, 1.0f, 3.0f, 5.0f, 7.0f}; + std::vector multBinsEdges{VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0, 100.1f}; + SliceCache cache; + + ColumnBinningPolicy + bindingOnVtxAndMult{{vtxBinsEdges, multBinsEdges}, true}; // true is for 'ignore overflows' (true by default) + SameKindPair> + pair{bindingOnVtxAndMult, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored + + // the process for filling the mixed events + void processMixed(aodCollisions& collisions, aodTracks const& tracks) + { + for (auto& [collision1, tracks1, collision2, tracks2] : pair) { + + if (fillCollision(collision1, collision1.centFT0C()) == false) { + continue; + } + + registry.fill(HIST("eventcount"), 1); // fill the mixed event in the 1 bin + + fillCorrelations(tracks1, tracks2, collision1.posZ(), 2,tracks1.size()); + } + } + PROCESS_SWITCH(CorrSparse, processMixed, "Process mixed events", true); +}; + +WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) +{ + return WorkflowSpec{ + adaptAnalysisTask(cfgc), + }; +} From 7f82634dc0ac11d1733881135f978353fe8ae9aa Mon Sep 17 00:00:00 2001 From: Thor Jensen Date: Mon, 18 Nov 2024 14:23:58 +0100 Subject: [PATCH 02/24] created a new task giving deltaeta deltaphi along with other information in a sparse --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 3674fd08890..7854c0eb924 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -131,7 +131,7 @@ void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, } } -//make the filters and cuts. I was told not to include chi2 and dca cuts since they are not needed for run 3 data. +//make the filters and cuts. I was told not to include chi2 since its not needed for run 3 data. Filter collisionFilter = nabs(aod::collision::posZ) < cfgZVtxCut; From 9174d9e450241487c69b09c6389e187375185f85 Mon Sep 17 00:00:00 2001 From: Thor Jensen Date: Mon, 18 Nov 2024 14:26:14 +0100 Subject: [PATCH 03/24] This is wrong --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index fd68848641e..14cefc461eb 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -52,7 +52,7 @@ o2physics_add_dpl_workflow(corrsparses SOURCES CorrSparse.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore - COMPONENT_NAME Analysis) + COMPONENT_NAME Analysis)adsadsad From af6ca3a7b57c9e66ca5d0f11fdfe2afd2f01a6cc Mon Sep 17 00:00:00 2001 From: Thor Jensen Date: Mon, 18 Nov 2024 14:26:31 +0100 Subject: [PATCH 04/24] added new task to cmake --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index 14cefc461eb..fd68848641e 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -52,7 +52,7 @@ o2physics_add_dpl_workflow(corrsparses SOURCES CorrSparse.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore - COMPONENT_NAME Analysis)adsadsad + COMPONENT_NAME Analysis) From 717ed0155d6ab7c297fa344d7d7f386d54782814 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 18 Nov 2024 13:35:50 +0000 Subject: [PATCH 05/24] Please consider the following formatting changes --- .../Tasks/CorrSparse.cxx | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 7854c0eb924..f5d3cd8d6a3 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -18,7 +18,6 @@ #include "TMath.h" #include - namespace o2::aod { namespace hash @@ -48,14 +47,12 @@ struct CorrSparse { Configurable cfgCutChi2prTPCcls = {"chi2cut", 2.5, "Chi2 cut. Default 2.5"}; - - ConfigurableAxis axisVertex{"axisVertex", {7, -7, 7}, "vertex axis for histograms"}; ConfigurableAxis axisDeltaPhi{"axisDeltaPhi", {72, -constants::math::PIHalf, constants::math::PIHalf * 3}, "delta phi axis for histograms"}; ConfigurableAxis axisDeltaEta{"axisDeltaEta", {40, -2, 2}, "delta eta axis for histograms"}; ConfigurableAxis axisPtTrigger{"axisPtTrigger", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt trigger axis for histograms"}; - ConfigurableAxis axisPtAssoc{"axisPtAssoc", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0,10.0}, "pt associated axis for histograms"}; - ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10,15,20,25,30,35,40,50,60,80,100 }, "multiplicity / centrality axis for histograms"}; + ConfigurableAxis axisPtAssoc{"axisPtAssoc", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt associated axis for histograms"}; + ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100}, "multiplicity / centrality axis for histograms"}; HistogramRegistry registry{"registry"}; int logcolls = 0; @@ -64,30 +61,29 @@ struct CorrSparse { void init(InitContext&) { LOGF(info, "Starting init"); - registry.add("Yield", "pT vs eta vs Nch", {HistType::kTH3F, { {40, 0, 20, "p_{T}"}, {100, -2, 2, "#eta"}, {100, 0, 100, "Nch"}}}); // check to see total number of tracks - registry.add("etaphi_Trigger", "eta vs phi vs Nch", {HistType::kTH3F, { {100, -2, 2, "#eta"}, {200, 0, 2 * M_PI, "#varphi"}, {100, 0, 100, "Nch"}}}); + registry.add("Yield", "pT vs eta vs Nch", {HistType::kTH3F, {{40, 0, 20, "p_{T}"}, {100, -2, 2, "#eta"}, {100, 0, 100, "Nch"}}}); // check to see total number of tracks + registry.add("etaphi_Trigger", "eta vs phi vs Nch", {HistType::kTH3F, {{100, -2, 2, "#eta"}, {200, 0, 2 * M_PI, "#varphi"}, {100, 0, 100, "Nch"}}}); - registry.add("deltaEta_deltaPhi_same", "", {HistType::kTH2D,{axisDeltaPhi, axisDeltaEta}}); //check to see the delta eta and delta phi distribution - registry.add("deltaEta_deltaPhi_mixed", "", {HistType::kTH2D ,{axisDeltaPhi, axisDeltaEta}}); - - registry.add("Sparse_mixed", "", {HistType::kTHnSparseD,{{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); // Make the output sparse - registry.add("Sparse_same", "", {HistType::kTHnSparseD,{{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); + registry.add("deltaEta_deltaPhi_same", "", {HistType::kTH2D, {axisDeltaPhi, axisDeltaEta}}); // check to see the delta eta and delta phi distribution + registry.add("deltaEta_deltaPhi_mixed", "", {HistType::kTH2D, {axisDeltaPhi, axisDeltaEta}}); + + registry.add("Sparse_mixed", "", {HistType::kTHnSparseD, {{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); // Make the output sparse + registry.add("Sparse_same", "", {HistType::kTHnSparseD, {{axisVertex, axisPtTrigger, axisPtAssoc, axisMultiplicity, axisDeltaPhi, axisDeltaEta}}}); const int maxMixBin = axisMultiplicity->size() * axisVertex->size(); - registry.add("eventcount", "bin", {HistType::kTH1F,{{maxMixBin + 2, -2.5, -0.5 + maxMixBin, "bin"}}}); //histogram to see how many events are in the same and mixed event + registry.add("eventcount", "bin", {HistType::kTH1F, {{maxMixBin + 2, -2.5, -0.5 + maxMixBin, "bin"}}}); // histogram to see how many events are in the same and mixed event } - template void fillYield(TCollision collision, float centrality, TTracks tracks) // function to fill the yield and etaphi histograms. (This is not needed can be removed) { for (auto& track1 : tracks) { registry.fill(HIST("Yield"), track1.pt(), track1.eta(), track1.size()); - registry.fill(HIST("etaphi_Trigger"), track1.size(),track1.phi(), track1.eta()); + registry.fill(HIST("etaphi_Trigger"), track1.size(), track1.phi(), track1.eta()); } } - template < typename TCollision> + template bool fillCollision(TCollision collision, float centrality) { @@ -98,13 +94,12 @@ struct CorrSparse { return true; } - -template < typename TTracks> -void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, float Nch) // function to fill the Output functions (sparse) and the delta eta and delta phi histograms + template + void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, float Nch) // function to fill the Output functions (sparse) and the delta eta and delta phi histograms { // loop over all tracks for (auto& track1 : tracks1) { - + for (auto& track2 : tracks2) { if (track1 == track2) { continue; @@ -131,48 +126,43 @@ void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, } } -//make the filters and cuts. I was told not to include chi2 since its not needed for run 3 data. + // make the filters and cuts. I was told not to include chi2 since its not needed for run 3 data. - Filter collisionFilter = nabs(aod::collision::posZ) < cfgZVtxCut; + Filter collisionFilter = nabs(aod::collision::posZ) < cfgZVtxCut; - Filter trackFilter = (nabs(aod::track::eta) < cfgEtaCut) && (aod::track::pt > cfgPtCutMin) && (aod::track::pt < cfgPtCutMax) - && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) - //&& (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls) - && (nabs(aod::track::dcaZ) > cfgDCAzCut) - && (cfgDCAxySigmaCut * (0.0015f+0.005f/npow(aod::track::pt,1.1f)) < nabs(aod::track::dcaXY)); + Filter trackFilter = (nabs(aod::track::eta) < cfgEtaCut) && (aod::track::pt > cfgPtCutMin) && (aod::track::pt < cfgPtCutMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) + //&& (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls) + && (nabs(aod::track::dcaZ) > cfgDCAzCut) && (cfgDCAxySigmaCut * (0.0015f + 0.005f / npow(aod::track::pt, 1.1f)) < nabs(aod::track::dcaXY)); // - // define the filtered collisions and tracks -using aodCollisions = soa::Filtered>; + // define the filtered collisions and tracks + using aodCollisions = soa::Filtered>; using aodTracks = soa::Filtered>; - -// process for the same event -void processSame(aodCollisions::iterator const& collision, aodTracks const& tracks) + // process for the same event + void processSame(aodCollisions::iterator const& collision, aodTracks const& tracks) { const auto centrality = collision.centFT0C(); - registry.fill(HIST("eventcount"), -2); //because its same event i put it in the -2 bin + registry.fill(HIST("eventcount"), -2); // because its same event i put it in the -2 bin fillYield(collision, centrality, tracks); - fillCorrelations( tracks, tracks, collision.posZ(), 1,tracks.size()); // fill the SE histogram and Sparse + fillCorrelations(tracks, tracks, collision.posZ(), 1, tracks.size()); // fill the SE histogram and Sparse } PROCESS_SWITCH(CorrSparse, processSame, "Process same event", true); - - -// i do the event mixing (i have not changed this from the tutorial i got). + // i do the event mixing (i have not changed this from the tutorial i got). std::vector vtxBinsEdges{VARIABLE_WIDTH, -7.0f, -5.0f, -3.0f, -1.0f, 1.0f, 3.0f, 5.0f, 7.0f}; std::vector multBinsEdges{VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0, 100.1f}; SliceCache cache; - + ColumnBinningPolicy bindingOnVtxAndMult{{vtxBinsEdges, multBinsEdges}, true}; // true is for 'ignore overflows' (true by default) SameKindPair> + aodTracks, + ColumnBinningPolicy> pair{bindingOnVtxAndMult, 5, -1, &cache}; // indicates that 5 events should be mixed and under/overflow (-1) to be ignored - // the process for filling the mixed events + // the process for filling the mixed events void processMixed(aodCollisions& collisions, aodTracks const& tracks) { for (auto& [collision1, tracks1, collision2, tracks2] : pair) { @@ -183,7 +173,7 @@ void processSame(aodCollisions::iterator const& collision, aodTracks const& trac registry.fill(HIST("eventcount"), 1); // fill the mixed event in the 1 bin - fillCorrelations(tracks1, tracks2, collision1.posZ(), 2,tracks1.size()); + fillCorrelations(tracks1, tracks2, collision1.posZ(), 2, tracks1.size()); } } PROCESS_SWITCH(CorrSparse, processMixed, "Process mixed events", true); From 220eec376d318c0f52ca0a2f579e00ab7ca285a8 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:33:01 +0100 Subject: [PATCH 06/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index f5d3cd8d6a3..47805778aa2 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -1,3 +1,14 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h" From 7d6b31c4cbab551849373104a7890bcee4d9bf8d Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:04:32 +0100 Subject: [PATCH 07/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 47805778aa2..df558a9853e 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -28,6 +28,7 @@ #include #include "TMath.h" #include +#include namespace o2::aod { From 1c3a6bacb722754cf33ec302b6a86033474e0833 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:09:16 +0100 Subject: [PATCH 08/24] Update CorrSparse.cxx From 18b63930a1437323ff05ae952089ee9adb46a366 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:20:09 +0100 Subject: [PATCH 09/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index df558a9853e..8f654ae50b3 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -22,11 +22,11 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" +#include "TMath.h" #include "TList.h" #include #include #include -#include "TMath.h" #include #include From 61ae0442c974930c66a0b3257fe92387f4c7d372 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:22:16 +0100 Subject: [PATCH 10/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 8f654ae50b3..fa9707efb01 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -49,13 +49,13 @@ int s = 1; // same event int m = 2; // mixed event struct CorrSparse { - Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; - Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; - Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; - Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; - Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; - Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; - Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; +Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; +Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; +Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; +Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; +Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; +Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; +Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; Configurable cfgCutChi2prTPCcls = {"chi2cut", 2.5, "Chi2 cut. Default 2.5"}; From cf57aba33e891b16d1067b5b89d226b954d8bdd5 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:24:47 +0100 Subject: [PATCH 11/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index fa9707efb01..8f654ae50b3 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -49,13 +49,13 @@ int s = 1; // same event int m = 2; // mixed event struct CorrSparse { -Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; -Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; -Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; -Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; -Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; -Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; -Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; + Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; + Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; + Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; + Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; + Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; + Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; + Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; Configurable cfgCutChi2prTPCcls = {"chi2cut", 2.5, "Chi2 cut. Default 2.5"}; From 72a30b185530d66f29f9a3f816056d3d43f4d144 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:26:54 +0100 Subject: [PATCH 12/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 8f654ae50b3..e6a96481ae4 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -49,10 +49,10 @@ int s = 1; // same event int m = 2; // mixed event struct CorrSparse { - Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; - Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; + Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; + Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; - Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; + Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; From f849c6676b39bac74d0304226439b25a9c854dc2 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:28:29 +0100 Subject: [PATCH 13/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index e6a96481ae4..8f654ae50b3 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -49,10 +49,10 @@ int s = 1; // same event int m = 2; // mixed event struct CorrSparse { - Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; - Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; + Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; + Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; Configurable cfgPtCutMax = {"maxpt", 5.0, "Maximum accepted track pT. Default 5.0 GeV"}; - Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; + Configurable cfgEtaCut = {"etacut", 0.8, "Eta cut. Default 0.8"}; Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; From 5f7a027ad267aebab60b82fcb251f1ba0c439055 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:34:01 +0100 Subject: [PATCH 14/24] Update PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Vít Kučera --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 8f654ae50b3..60523b8c3c8 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -110,9 +110,9 @@ struct CorrSparse { void fillCorrelations(TTracks tracks1, TTracks tracks2, float posZ, int system, float Nch) // function to fill the Output functions (sparse) and the delta eta and delta phi histograms { // loop over all tracks - for (auto& track1 : tracks1) { + for (auto const& track1 : tracks1) { - for (auto& track2 : tracks2) { + for (auto const& track2 : tracks2) { if (track1 == track2) { continue; } From a6076c25c5335bb81cc3e3f6ff59dbdac2dcae49 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:42:06 +0100 Subject: [PATCH 15/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 60523b8c3c8..18f5c794145 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -24,8 +24,8 @@ #include "TMath.h" #include "TList.h" -#include -#include +#include "TProfile.h" +#include "TRandom3.h" #include #include #include From 94fe4f9fedc519299f4d752ca501b831313db65e Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:52:29 +0100 Subject: [PATCH 16/24] Update CorrSparse.cxx I removed some headers which were not needed --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 18f5c794145..36b967bcfaf 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -22,12 +22,6 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" -#include "TMath.h" -#include "TList.h" -#include "TProfile.h" -#include "TRandom3.h" -#include -#include #include namespace o2::aod @@ -45,9 +39,6 @@ using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; -int s = 1; // same event -int m = 2; // mixed event - struct CorrSparse { Configurable cfgZVtxCut = {"zvtxcut", 10.0, "Vertex z cut. Default 10 cm"}; Configurable cfgPtCutMin = {"minpt", 0.2, "Minimum accepted track pT. Default 0.2 GeV"}; From cccb8cfb78aa66df4eb9db999bc1b16361941854 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:11:22 +0100 Subject: [PATCH 17/24] Update CorrSparse.cxx --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 36b967bcfaf..4be5cb09ff5 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -9,6 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +#include #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h" @@ -22,8 +23,6 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" -#include - namespace o2::aod { namespace hash @@ -47,16 +46,13 @@ struct CorrSparse { Configurable cfgDCAzCut = {"dcacut", 0.3, "DCA z cut. Default 0.3 cm"}; Configurable cfgDCAxyCut = {"dcacutxy", 0.3, "DCA xy cut. Default 0.2 cm"}; Configurable cfgDCAxySigmaCut = {"dcacutxysigma", 1, "DCA xy sigma cut. Default 0.3"}; - Configurable cfgCutChi2prTPCcls = {"chi2cut", 2.5, "Chi2 cut. Default 2.5"}; - ConfigurableAxis axisVertex{"axisVertex", {7, -7, 7}, "vertex axis for histograms"}; ConfigurableAxis axisDeltaPhi{"axisDeltaPhi", {72, -constants::math::PIHalf, constants::math::PIHalf * 3}, "delta phi axis for histograms"}; ConfigurableAxis axisDeltaEta{"axisDeltaEta", {40, -2, 2}, "delta eta axis for histograms"}; ConfigurableAxis axisPtTrigger{"axisPtTrigger", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt trigger axis for histograms"}; ConfigurableAxis axisPtAssoc{"axisPtAssoc", {VARIABLE_WIDTH, 0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 10.0}, "pt associated axis for histograms"}; ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100}, "multiplicity / centrality axis for histograms"}; - HistogramRegistry registry{"registry"}; int logcolls = 0; int logcollpairs = 0; From 98d6470ba9c9c7664420a614b2b829d5e53db263 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:16:13 +0100 Subject: [PATCH 18/24] Update CorrSparse.cxx From 61f2c25baf5fd7980eed58ecddf36e29c264e489 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:18:27 +0100 Subject: [PATCH 19/24] Update CMakeLists.txt --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index fd68848641e..9d47103e9f2 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -49,10 +49,9 @@ o2physics_add_dpl_workflow(twopartcorr-per-run-extraqc COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(corrsparses - SOURCES CorrSparse.cxx - PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore -O2Physics::PWGCFCore - COMPONENT_NAME Analysis) + SOURCES CorrSparse.cxx + PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore + COMPONENT_NAME Analysis) From 227aae79c62a669c60b282d3d4eeffcb2e6384b9 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:19:29 +0100 Subject: [PATCH 20/24] Update CMakeLists.txt --- PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt index 9d47103e9f2..3d939cff243 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt +++ b/PWGCF/TwoParticleCorrelations/Tasks/CMakeLists.txt @@ -51,7 +51,7 @@ o2physics_add_dpl_workflow(twopartcorr-per-run-extraqc o2physics_add_dpl_workflow(corrsparses SOURCES CorrSparse.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore - COMPONENT_NAME Analysis) + COMPONENT_NAME Analysis) From 21946005fe7de189692865c72d6806f6c9e89f52 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:24:32 +0100 Subject: [PATCH 21/24] Update CorrSparse.cxx removed namespase o2::aod --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 4be5cb09ff5..d506e022b33 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -23,16 +23,6 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" -namespace o2::aod -{ -namespace hash -{ -DECLARE_SOA_COLUMN(Bin, bin, int); -} // namespace hash -DECLARE_SOA_TABLE(Hashes, "AOD", "HASH", hash::Bin); - -using Hash = Hashes::iterator; -} // namespace o2::aod using namespace o2; using namespace o2::framework; From a32a7c725abaca5a1ede0c5b9a462a6c9c76b8a1 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 21 Nov 2024 13:24:58 +0000 Subject: [PATCH 22/24] Please consider the following formatting changes --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index d506e022b33..995a35c17fa 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -23,7 +23,6 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; From 3f6570ab9631cf029d1404a5f3bea83653142a16 Mon Sep 17 00:00:00 2001 From: Thorkj <154221526+Thorkj@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:06:41 +0100 Subject: [PATCH 23/24] Update CorrSparse.cxx I have changed to RicoDecay::constrainAngle() --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 995a35c17fa..823f4374175 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -16,6 +16,7 @@ #include "Framework/ASoAHelpers.h" #include "Framework/HistogramRegistry.h" #include "Framework/RunningWorkflowInfo.h" +#include "Common/Core/RecoDecay.h" #include "CommonConstants/MathConstants.h" #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/TrackSelectionTables.h" @@ -23,6 +24,7 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" + using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; @@ -95,12 +97,7 @@ struct CorrSparse { float deltaPhi = track1.phi() - track2.phi(); float deltaEta = track1.eta() - track2.eta(); - if (deltaPhi > 1.5f * PI) { - deltaPhi -= TwoPI; - } - if (deltaPhi < -PIHalf) { - deltaPhi += TwoPI; - } + RecoDecay::constrainAngle(deltaPhi, -PIHalf); // fill the right sparse and histograms if (system == 1) { From 5270dd4a87ad94f8f260b99bcf85085523e408fc Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 26 Nov 2024 12:07:10 +0000 Subject: [PATCH 24/24] Please consider the following formatting changes --- PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx index 823f4374175..0d840103eb2 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/CorrSparse.cxx @@ -24,7 +24,6 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions;