From 61e2b1c4d2b817ccdc695a9956f250d039310ba3 Mon Sep 17 00:00:00 2001 From: Magnus Date: Wed, 30 Jul 2025 13:36:18 +0200 Subject: [PATCH 1/7] Commented out problematic unused fillmap variable --- PWGDQ/Tasks/tableReader_withAssoc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Tasks/tableReader_withAssoc.cxx b/PWGDQ/Tasks/tableReader_withAssoc.cxx index 5423591e7d9..966b71a9424 100644 --- a/PWGDQ/Tasks/tableReader_withAssoc.cxx +++ b/PWGDQ/Tasks/tableReader_withAssoc.cxx @@ -229,7 +229,7 @@ using MyMuonTracksSelectedWithColl = soa::Join Date: Wed, 30 Jul 2025 11:38:33 +0000 Subject: [PATCH 2/7] Please consider the following formatting changes --- PWGDQ/Tasks/tableReader_withAssoc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Tasks/tableReader_withAssoc.cxx b/PWGDQ/Tasks/tableReader_withAssoc.cxx index 966b71a9424..5423591e7d9 100644 --- a/PWGDQ/Tasks/tableReader_withAssoc.cxx +++ b/PWGDQ/Tasks/tableReader_withAssoc.cxx @@ -229,7 +229,7 @@ using MyMuonTracksSelectedWithColl = soa::Join Date: Tue, 22 Jul 2025 15:02:37 +0200 Subject: [PATCH 3/7] [PWGLF] Add rapidity selection (#12155) From 68e24eda66d414768f34d7cfb3e47cebf1f34676 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Wed, 30 Jul 2025 21:10:11 +0200 Subject: [PATCH 4/7] [Common] improve handling of PVz QA histograms (#12287) Co-authored-by: ALICE Builder From 2027aa006c1b483b76d099b32ba776e6b3e66976 Mon Sep 17 00:00:00 2001 From: Magnus Date: Mon, 3 Nov 2025 12:23:55 +0100 Subject: [PATCH 5/7] Additions to Mixing Library --- PWGDQ/Core/MixingLibrary.cxx | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx index 2f2f755269d..e368aace49c 100644 --- a/PWGDQ/Core/MixingLibrary.cxx +++ b/PWGDQ/Core/MixingLibrary.cxx @@ -168,4 +168,32 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible std::vector fPsi2C = {-12 * TMath::Pi() / 24., -11 * TMath::Pi() / 24., -10 * TMath::Pi() / 24., -9 * TMath::Pi() / 24., -8 * TMath::Pi() / 24., -7 * TMath::Pi() / 24., -6 * TMath::Pi() / 24., -5 * TMath::Pi() / 24., -4 * TMath::Pi() / 24., -3 * TMath::Pi() / 24., -2 * TMath::Pi() / 24., -TMath::Pi() / 24., 0.0f, TMath::Pi() / 24., 2 * TMath::Pi() / 24., 3 * TMath::Pi() / 24., 4 * TMath::Pi() / 24., 5 * TMath::Pi() / 24., 6 * TMath::Pi() / 24., 7 * TMath::Pi() / 24., 8 * TMath::Pi() / 24., 9 * TMath::Pi() / 24., 10 * TMath::Pi() / 24., 11 * TMath::Pi() / 24., 12 * TMath::Pi() / 24.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C.size(), fPsi2C); } + if (!nameStr.compare("MedianTimeA1")) { + std::vector fMultLimsHashing = {-100.0f, -40.0f, -20.0f, 20.0f, 40.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("MedianTimeA2")) { + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("MedianTimeA3")) { + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30,0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("PileUpA1")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 6000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("PileUpA2")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 4000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("PileUpA3")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 3000.0f, 4000.0f, 5000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("PileUpA4")) { + std::vector fMultLimsHashing = {0.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 5500.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } } From 40032062dc26fcfa4d63d45f12ceda1877025dcf Mon Sep 17 00:00:00 2001 From: Magnus Date: Mon, 3 Nov 2025 13:23:26 +0100 Subject: [PATCH 6/7] Additions to MixingLibrary --- PWGDQ/Core/MixingLibrary.cxx | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx index e368aace49c..8a8708e1fef 100644 --- a/PWGDQ/Core/MixingLibrary.cxx +++ b/PWGDQ/Core/MixingLibrary.cxx @@ -192,6 +192,34 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 3000.0f, 4000.0f, 5000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); } + if (!nameStr.compare("PileUpA4")) { + std::vector fMultLimsHashing = {0.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 5500.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("MedianTimeA1")) { + std::vector fMultLimsHashing = {-100.0f, -40.0f, -20.0f, 20.0f, 40.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("MedianTimeA2")) { + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("MedianTimeA3")) { + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30,0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); + } + if (!nameStr.compare("PileUpA1")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 6000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("PileUpA2")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 4000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } + if (!nameStr.compare("PileUpA3")) { + std::vector fMultLimsHashing = {0.0f, 1000.0f, 2000.0f, 3000.0f, 4000.0f, 5000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; + mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); + } if (!nameStr.compare("PileUpA4")) { std::vector fMultLimsHashing = {0.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 5500.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); From 8fae2a1da50f13176314c7851020f7082f49b23a Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 3 Nov 2025 12:28:37 +0000 Subject: [PATCH 7/7] Please consider the following formatting changes --- PWGDQ/Core/MixingLibrary.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx index 8a8708e1fef..c56998f9c3f 100644 --- a/PWGDQ/Core/MixingLibrary.cxx +++ b/PWGDQ/Core/MixingLibrary.cxx @@ -177,7 +177,7 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); } if (!nameStr.compare("MedianTimeA3")) { - std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30,0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30, 0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); } if (!nameStr.compare("PileUpA1")) { @@ -196,7 +196,7 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible std::vector fMultLimsHashing = {0.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 5500.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing.size(), fPileUpLimsHashing); } - if (!nameStr.compare("MedianTimeA1")) { + if (!nameStr.compare("MedianTimeA1")) { std::vector fMultLimsHashing = {-100.0f, -40.0f, -20.0f, 20.0f, 40.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); } @@ -205,7 +205,7 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); } if (!nameStr.compare("MedianTimeA3")) { - std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30,0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; + std::vector fMultLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30, 0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing.size(), fMTLimsHashing); } if (!nameStr.compare("PileUpA1")) {