From bf5253841e9e57179f8b5fdbcb684137d1d815b3 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Mon, 20 May 2024 11:13:55 -0600 Subject: [PATCH 01/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index cd8af5e0307..582f7318b88 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -817,6 +817,11 @@ struct LumiStabilityTask { histos.fill(HIST("FT0/hCounts"), 3); histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC); } + if (pastActivityFT0Vertex == true) { + histos.fill(HIST("FT0/hCounts"), 3); + } else { + histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC); + } } // vertex true if (sCentral) { From f93f45b18ceaabfb99b25d2038d452f9b64cc78a Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 15 Aug 2024 13:19:33 -0600 Subject: [PATCH 02/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 582f7318b88..af1d6cd04a3 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -822,6 +822,10 @@ struct LumiStabilityTask { } else { histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC); } + if (pastActivityFT0TriggerA == false || pastActivityFT0TriggerC == false) { + histos.fill(HIST("FT0/hCounts"), 3); + histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC); + } } // vertex true if (sCentral) { From 6fd707f8a6628b63777d9a3e75802eab8f0b2b62 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Wed, 2 Oct 2024 03:49:44 -0600 Subject: [PATCH 03/21] Ordering the kind of trigger to be used in the histogram entries --- PWGMM/Lumi/Tasks/lumiStability.cxx | 50 ++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index af1d6cd04a3..856d8134420 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -556,14 +556,21 @@ struct LumiStabilityTask { } } - if (isCoinA && isCoinC) { - histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC); - histos.fill(HIST("FDD/hCounts"), 3); - histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit); + if (deltaBC < myMaxDeltaBCFDD) { + std::bitset<8> fddTriggersPast = fdd_past.triggerMask(); + bool vertexPast = fddTriggersPast[o2::fdd::Triggers::bitVertex]; + pastActivityFDDVertex |= (vertexPast); + } + } + deltaIndex = 0; + deltaBC = 0; + if (pastActivityFDDVertex == false) { + histos.fill(HIST("FDD/hCounts"), 2); + histos.fill(HIST("FDD/bcVertexTriggerPP"), localBC); if (bcPatternA[localBC]) { - histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcA"), localBC); + histos.fill(HIST("FDD/timeACbcAVertex"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcAVertex"), localBC); } if (bcPatternC[localBC]) { histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC()); @@ -613,6 +620,37 @@ struct LumiStabilityTask { } } } + if (bcPatternB[localBC]) { + histos.fill(HIST("FDD/timeACbcBVertex"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcBVertex"), localBC); + } + if (bcPatternE[localBC]) { + histos.fill(HIST("FDD/timeACbcEVertex"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcEVertex"), localBC); + } + } + + + if (isCoinA && isCoinC) { + histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC); + histos.fill(HIST("FDD/hCounts"), 3); + histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit); + + if (bcPatternA[localBC]) { + histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcA"), localBC); + } + if (bcPatternC[localBC]) { + histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcC"), localBC); + } + if (bcPatternB[localBC]) { + histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcB"), localBC); + histos.fill(HIST("FDD/hTimeA"), fdd.timeA()); + histos.fill(HIST("FDD/hTimeC"), fdd.timeC()); + + } if (bcPatternE[localBC]) { histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC()); histos.fill(HIST("FDD/hBcE"), localBC); From 8742d5230da08fefa9975a084da6e63dcf7a0923 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Mon, 7 Oct 2024 10:31:41 -0600 Subject: [PATCH 04/21] correcting the histo of time for fdd --- PWGMM/Lumi/Tasks/lumiStability.cxx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 856d8134420..7356e7b6339 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -620,14 +620,6 @@ struct LumiStabilityTask { } } } - if (bcPatternB[localBC]) { - histos.fill(HIST("FDD/timeACbcBVertex"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcBVertex"), localBC); - } - if (bcPatternE[localBC]) { - histos.fill(HIST("FDD/timeACbcEVertex"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcEVertex"), localBC); - } } @@ -647,8 +639,8 @@ struct LumiStabilityTask { if (bcPatternB[localBC]) { histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC()); histos.fill(HIST("FDD/hBcB"), localBC); - histos.fill(HIST("FDD/hTimeA"), fdd.timeA()); - histos.fill(HIST("FDD/hTimeC"), fdd.timeC()); + histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA()); + histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC()); } if (bcPatternE[localBC]) { From ca1539c7f1a50197c64f3b099ba16e8077714f9c Mon Sep 17 00:00:00 2001 From: Josue laptop Date: Tue, 8 Oct 2024 14:26:26 +0200 Subject: [PATCH 05/21] adding the flags to 2022 data --- PWGMM/Lumi/Tasks/lumiStability.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 7356e7b6339..6581c55944c 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -641,7 +641,6 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/hBcB"), localBC); histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA()); histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC()); - } if (bcPatternE[localBC]) { histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC()); From d3485f4de33993ec9495447ca43f5c9909d865a8 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 31 Oct 2024 00:32:00 -0600 Subject: [PATCH 06/21] Issue with access histos --- PWGMM/Lumi/Tasks/lumiStability.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 6581c55944c..4125141b034 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -270,6 +270,7 @@ struct LumiStabilityTask { nOrbitsPerTF = 32; // 128 in 2022, 32 in 2023 } int runNumber = bcs.iteratorAt(0).runNumber(); + // std::string histName = "hOrbitFDDVertexCoinc_" + std::to_string(runNumber); if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; tsEOR = 1; @@ -456,7 +457,7 @@ struct LumiStabilityTask { if (vertex) { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); - histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); + // histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds @@ -748,7 +749,7 @@ struct LumiStabilityTask { histos.fill(HIST("FT0/hCounts"), 0); if (vertex) { histos.fill(HIST("FT0/bcVertexTrigger"), localBC); - histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); + // histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); if (bcPatternA[localBC]) { histos.fill(HIST("FT0/timeACbcA"), ft0.timeA(), ft0.timeC()); @@ -904,7 +905,7 @@ struct LumiStabilityTask { } if (aCen) { - histos.fill(HIST("hOrbitFV0Central"), orbit - minOrbit); + // histos.fill(HIST("hOrbitFV0Central"), orbit - minOrbit); histos.fill(HIST("FV0/bcCenTrigger"), localBC); if (bcPatternA[localBC]) { From eb84da820bfb6349fa9e413f8a32d0ad98432ca2 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 31 Oct 2024 00:45:38 -0600 Subject: [PATCH 07/21] resolving issues --- PWGMM/Lumi/Tasks/lumiStability.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 4125141b034..3e9de91cc8b 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -37,6 +37,11 @@ #include #include +#include +#include +#include +#include + using namespace o2; using namespace o2::framework; From c43086f3af05c2cf3dd296337b2de8ea9d5a7e4c Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 31 Oct 2024 00:51:10 -0600 Subject: [PATCH 08/21] resolving issues --- PWGMM/Lumi/Tasks/lumiStability.cxx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 3e9de91cc8b..4125141b034 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -37,11 +37,6 @@ #include #include -#include -#include -#include -#include - using namespace o2; using namespace o2::framework; From efdabef3ff9bf936d76c22bb152a4ce11157d8f9 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 31 Oct 2024 12:13:10 -0600 Subject: [PATCH 09/21] a solution for histo acces --- PWGMM/Lumi/Tasks/lumiStability.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 4125141b034..915c391d23f 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -457,7 +457,7 @@ struct LumiStabilityTask { if (vertex) { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); - // histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); + histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds @@ -749,7 +749,7 @@ struct LumiStabilityTask { histos.fill(HIST("FT0/hCounts"), 0); if (vertex) { histos.fill(HIST("FT0/bcVertexTrigger"), localBC); - // histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); + histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); if (bcPatternA[localBC]) { histos.fill(HIST("FT0/timeACbcA"), ft0.timeA(), ft0.timeC()); @@ -905,7 +905,7 @@ struct LumiStabilityTask { } if (aCen) { - // histos.fill(HIST("hOrbitFV0Central"), orbit - minOrbit); + histos.fill(HIST("hOrbitFV0Central"), orbit - minOrbit); histos.fill(HIST("FV0/bcCenTrigger"), localBC); if (bcPatternA[localBC]) { From f3343a20d4ae3ca095a1a3a9a31cce6a242ad603 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Mon, 9 Dec 2024 23:28:28 -0600 Subject: [PATCH 10/21] new changes, --- PWGMM/Lumi/Tasks/lumiStability.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 915c391d23f..c18d2813a8d 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -270,6 +270,8 @@ struct LumiStabilityTask { nOrbitsPerTF = 32; // 128 in 2022, 32 in 2023 } int runNumber = bcs.iteratorAt(0).runNumber(); + int64_t tsSOR = 0; + int64_t tsEOR = 1; // std::string histName = "hOrbitFDDVertexCoinc_" + std::to_string(runNumber); if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; @@ -458,6 +460,7 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); + histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1000); // Converting ms into seconds if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds From ae3037ca22f598aaf61cd4b3629ba61d0e82f2db Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Tue, 17 Dec 2024 17:10:39 -0600 Subject: [PATCH 11/21] new changes, histo for rate calculus added --- PWGMM/Lumi/Tasks/lumiStability.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index c18d2813a8d..823d5983736 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -270,8 +270,8 @@ struct LumiStabilityTask { nOrbitsPerTF = 32; // 128 in 2022, 32 in 2023 } int runNumber = bcs.iteratorAt(0).runNumber(); - int64_t tsSOR = 0; - int64_t tsEOR = 1; + int64_t tsSOR; + int64_t tsEOR; // std::string histName = "hOrbitFDDVertexCoinc_" + std::to_string(runNumber); if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; @@ -358,6 +358,7 @@ struct LumiStabilityTask { // histos.add("hOrbitFT0vertex", "", kTH1F, {axisOrbits}); // histos.add("hOrbitFV0Central", "", kTH1F, {axisOrbits}); } + // std::cout << "****************** tsSOR: " << (tsSOR) * 1.e-3 << " ************************* " << std::endl; for (auto const& bc : bcs) { if (bc.timestamp() == 0) { @@ -460,7 +461,10 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); - histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1000); // Converting ms into seconds + // std::cout << "****************** timestamp - tsSOR: " << (bc.timestamp() - tsSOR) * 1000 << " ************************* " << std::endl; + // std::cout << "****************** timestamp: " << (bc.timestamp()) * 1000 << " ************************* " << std::endl; //1660925892880000 + // std::cout << "****************** tsSOR: " << (tsSOR) * 1000 << " ************************* " << std::endl; + histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds @@ -753,6 +757,7 @@ struct LumiStabilityTask { if (vertex) { histos.fill(HIST("FT0/bcVertexTrigger"), localBC); histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); + histos.fill(HIST("FT0/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds if (bcPatternA[localBC]) { histos.fill(HIST("FT0/timeACbcA"), ft0.timeA(), ft0.timeC()); From a1567760fc60d0257e3e9ced86bf78106221a30b Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Thu, 19 Dec 2024 22:15:46 -0600 Subject: [PATCH 12/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 823d5983736..e0d460e71e1 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -272,7 +272,6 @@ struct LumiStabilityTask { int runNumber = bcs.iteratorAt(0).runNumber(); int64_t tsSOR; int64_t tsEOR; - // std::string histName = "hOrbitFDDVertexCoinc_" + std::to_string(runNumber); if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; tsEOR = 1; @@ -358,7 +357,6 @@ struct LumiStabilityTask { // histos.add("hOrbitFT0vertex", "", kTH1F, {axisOrbits}); // histos.add("hOrbitFV0Central", "", kTH1F, {axisOrbits}); } - // std::cout << "****************** tsSOR: " << (tsSOR) * 1.e-3 << " ************************* " << std::endl; for (auto const& bc : bcs) { if (bc.timestamp() == 0) { @@ -461,9 +459,6 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); - // std::cout << "****************** timestamp - tsSOR: " << (bc.timestamp() - tsSOR) * 1000 << " ************************* " << std::endl; - // std::cout << "****************** timestamp: " << (bc.timestamp()) * 1000 << " ************************* " << std::endl; //1660925892880000 - // std::cout << "****************** tsSOR: " << (tsSOR) * 1000 << " ************************* " << std::endl; histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds if (bcPatternB[localBC]) { From 8c3a75880447cbbb846b8e496039b7018d124646 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Mon, 23 Dec 2024 23:50:02 -0600 Subject: [PATCH 13/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index e0d460e71e1..f8cc1dd57f2 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -1,3 +1,9 @@ +/** + * \file lumiStability.cxx + * \brief Analysis over BCs to study the luminosity stability along time. + * \author josuem@cern.ch + */ + // 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. From ea5538ce5f13f034154533c7db60b6984df062da Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Mon, 23 Dec 2024 23:51:44 -0600 Subject: [PATCH 14/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index f8cc1dd57f2..e0d460e71e1 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -1,9 +1,3 @@ -/** - * \file lumiStability.cxx - * \brief Analysis over BCs to study the luminosity stability along time. - * \author josuem@cern.ch - */ - // 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. From d7df40b33275b7a04a943497b0629d94856bbea9 Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Tue, 24 Dec 2024 14:10:54 -0600 Subject: [PATCH 15/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index e0d460e71e1..4990b67f5b0 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -270,8 +270,8 @@ struct LumiStabilityTask { nOrbitsPerTF = 32; // 128 in 2022, 32 in 2023 } int runNumber = bcs.iteratorAt(0).runNumber(); - int64_t tsSOR; - int64_t tsEOR; + int64_t tsSOR = 0; + int64_t tsEOR = 1; if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; tsEOR = 1; From 5d3e56936a1b28859c13017ce2d1e3c26548e3ae Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Tue, 1 Apr 2025 08:32:09 -0600 Subject: [PATCH 16/21] adding leading BC pattern and corrections for rate --- PWGMM/Lumi/Tasks/lumiStability.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 4990b67f5b0..3a671384323 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -270,8 +270,6 @@ struct LumiStabilityTask { nOrbitsPerTF = 32; // 128 in 2022, 32 in 2023 } int runNumber = bcs.iteratorAt(0).runNumber(); - int64_t tsSOR = 0; - int64_t tsEOR = 1; if (runNumber != lastRunNumber && executionCounter < 1) { tsSOR = 0; tsEOR = 1; From f7714229aea1e2dc0cffde8cc5c2f5e69d91f4fc Mon Sep 17 00:00:00 2001 From: Josue-MiniPC Date: Fri, 11 Apr 2025 03:14:38 -0600 Subject: [PATCH 17/21] new changes --- PWGMM/Lumi/Tasks/lumiStability.cxx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 3a671384323..657409ab417 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -457,7 +457,22 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/bcVertexTrigger"), localBC); histos.fill(HIST("FDD/hCounts"), 1); histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); - histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds + + if (bcPatternB[localBC]) { + histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds + bool isLeadBC = true; + for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) { + int kbit = jbit; + if (kbit < 0) + kbit += nbin; + if (bcPatternB[kbit]) { + isLeadBC = false; + break; + } + } + if (isLeadBC) + histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3); + } if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds @@ -750,7 +765,6 @@ struct LumiStabilityTask { if (vertex) { histos.fill(HIST("FT0/bcVertexTrigger"), localBC); histos.fill(HIST("hOrbitFT0vertex"), orbit - minOrbit); - histos.fill(HIST("FT0/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds if (bcPatternA[localBC]) { histos.fill(HIST("FT0/timeACbcA"), ft0.timeA(), ft0.timeC()); From 6a4df63476439eb4dde90a0ed8fcba36fd5e1c92 Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Wed, 12 Nov 2025 21:27:57 -0600 Subject: [PATCH 18/21] doing a rebase from master branch --- PWGMM/Lumi/Tasks/lumiStability.cxx | 66 +++--------------------------- 1 file changed, 6 insertions(+), 60 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 657409ab417..cd8af5e0307 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -474,22 +474,6 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3); } - if (bcPatternB[localBC]) { - histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds - bool isLeadBC = true; - for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) { - int kbit = jbit; - if (kbit < 0) - kbit += nbin; - if (bcPatternB[kbit]) { - isLeadBC = false; - break; - } - } - if (isLeadBC) - histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3); - } - int deltaIndex = 0; // backward move counts int deltaBC = 0; // current difference wrt globalBC bool pastActivityFDDVertex = false; @@ -572,21 +556,14 @@ struct LumiStabilityTask { } } - if (deltaBC < myMaxDeltaBCFDD) { - std::bitset<8> fddTriggersPast = fdd_past.triggerMask(); - bool vertexPast = fddTriggersPast[o2::fdd::Triggers::bitVertex]; - pastActivityFDDVertex |= (vertexPast); - } - } - deltaIndex = 0; - deltaBC = 0; + if (isCoinA && isCoinC) { + histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC); + histos.fill(HIST("FDD/hCounts"), 3); + histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit); - if (pastActivityFDDVertex == false) { - histos.fill(HIST("FDD/hCounts"), 2); - histos.fill(HIST("FDD/bcVertexTriggerPP"), localBC); if (bcPatternA[localBC]) { - histos.fill(HIST("FDD/timeACbcAVertex"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcAVertex"), localBC); + histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC()); + histos.fill(HIST("FDD/hBcA"), localBC); } if (bcPatternC[localBC]) { histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC()); @@ -636,28 +613,6 @@ struct LumiStabilityTask { } } } - } - - - if (isCoinA && isCoinC) { - histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC); - histos.fill(HIST("FDD/hCounts"), 3); - histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit); - - if (bcPatternA[localBC]) { - histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcA"), localBC); - } - if (bcPatternC[localBC]) { - histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcC"), localBC); - } - if (bcPatternB[localBC]) { - histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC()); - histos.fill(HIST("FDD/hBcB"), localBC); - histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA()); - histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC()); - } if (bcPatternE[localBC]) { histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC()); histos.fill(HIST("FDD/hBcE"), localBC); @@ -862,15 +817,6 @@ struct LumiStabilityTask { histos.fill(HIST("FT0/hCounts"), 3); histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC); } - if (pastActivityFT0Vertex == true) { - histos.fill(HIST("FT0/hCounts"), 3); - } else { - histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC); - } - if (pastActivityFT0TriggerA == false || pastActivityFT0TriggerC == false) { - histos.fill(HIST("FT0/hCounts"), 3); - histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC); - } } // vertex true if (sCentral) { From 73cee1a48333bf59879d88f8765a1f13f5b56d2f Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Tue, 18 Nov 2025 01:45:00 -0600 Subject: [PATCH 19/21] adding histo for rate correction by filled jobs in alihyperloop --- PWGMM/Lumi/Tasks/lumiStability.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index cd8af5e0307..1cbdb9862f5 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -378,7 +378,7 @@ struct LumiStabilityTask { histos.fill(HIST("TFsPerMinute"), timeSinceSOF); } - if (bcPatternB[localBC]) { + // if (bcPatternB[localBC]) { if (trgFDD) { histos.fill(HIST("FDD/nBCsVsTime"), timeSinceSOF); histos.fill(HIST("FDD/bcVertexTriggerCTP"), localBC + 7); @@ -415,8 +415,7 @@ struct LumiStabilityTask { if (trgFV0) { histos.fill(HIST("FV0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); } - } - } + // } } // loop over bcs for (auto const& fdd : fdds) { From e63f2f6bca004f4ebe708cd2576274914606920f Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Tue, 18 Nov 2025 02:16:21 -0600 Subject: [PATCH 20/21] fixing Megalinter issues --- PWGMM/Lumi/Tasks/lumiStability.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 1cbdb9862f5..39aa9fb16fb 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -415,6 +415,7 @@ struct LumiStabilityTask { if (trgFV0) { histos.fill(HIST("FV0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); } + } // } } // loop over bcs From 6920b725cd3cc9130829e773059d25d0108bb72c Mon Sep 17 00:00:00 2001 From: Josue Martinez Garcia Date: Fri, 21 Nov 2025 01:19:00 -0600 Subject: [PATCH 21/21] fixing typo and logical filling of histos --- PWGMM/Lumi/Tasks/lumiStability.cxx | 65 ++++++++++++++++-------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/PWGMM/Lumi/Tasks/lumiStability.cxx b/PWGMM/Lumi/Tasks/lumiStability.cxx index 39aa9fb16fb..9584561af67 100644 --- a/PWGMM/Lumi/Tasks/lumiStability.cxx +++ b/PWGMM/Lumi/Tasks/lumiStability.cxx @@ -378,44 +378,49 @@ struct LumiStabilityTask { histos.fill(HIST("TFsPerMinute"), timeSinceSOF); } - // if (bcPatternB[localBC]) { - if (trgFDD) { + if (trgFDD) { + histos.fill(HIST("FDD/bcVertexTriggerCTP"), localBC + 7); + if (bcPatternB[localBC]) { histos.fill(HIST("FDD/nBCsVsTime"), timeSinceSOF); - histos.fill(HIST("FDD/bcVertexTriggerCTP"), localBC + 7); histos.fill(HIST("FDD/hTimeForRateCTP"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds } - if (trgFT0) { + } + if (trgFT0) { + histos.fill(HIST("FT0/bcVertexTriggerCTP"), localBC); + if (bcPatternB[localBC]) { histos.fill(HIST("FT0/nBCsVsTime"), timeSinceSOF); - histos.fill(HIST("FT0/bcVertexTriggerCTP"), localBC); histos.fill(HIST("FT0/hTimeForRateCTP"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds } - if (trgFV0) { - histos.fill(HIST("FV0/bcChargeTriggerCTP"), localBC); + } + if (trgFV0) { + histos.fill(HIST("FV0/bcChargeTriggerCTP"), localBC); + if (bcPatternB[localBC]) { histos.fill(HIST("FV0/hTimeForRateCTP"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds } - bool isLeadBC = true; - for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) { - int kbit = jbit; - if (kbit < 0) - kbit += nbin; - if (bcPatternB[kbit]) { - isLeadBC = false; - break; - } + } + bool isLeadBC = true; + for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) { + int kbit = jbit; + if (kbit < 0) + kbit += nbin; + if (bcPatternB[kbit]) { + isLeadBC = false; + break; } - if (isLeadBC) { - if (trgFDD) { - histos.fill(HIST("FDD/nBCsVsTimeLeadingBCe"), timeSinceSOF); - histos.fill(HIST("FDD/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); - } - if (trgFT0) { - histos.fill(HIST("FT0/nBCsVsTimeLeadingBCe"), timeSinceSOF); - histos.fill(HIST("FT0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); - } - if (trgFV0) { - histos.fill(HIST("FV0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); - } + } + if (isLeadBC) { + if (trgFDD) { + histos.fill(HIST("FDD/nBCsVsTimeLeadingBC"), timeSinceSOF); + histos.fill(HIST("FDD/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); + } + if (trgFT0) { + histos.fill(HIST("FT0/nBCsVsTimeLeadingBC"), timeSinceSOF); + histos.fill(HIST("FT0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); + } + if (trgFV0) { + histos.fill(HIST("FV0/hTimeForRateLeadingBCCTP"), (bc.timestamp() - tsSOR) * 1.e-3); } + } // } } // loop over bcs @@ -454,9 +459,9 @@ struct LumiStabilityTask { histos.fill(HIST("FDD/hCounts"), 0); if (vertex) { - histos.fill(HIST("FDD/bcVertexTrigger"), localBC); - histos.fill(HIST("FDD/hCounts"), 1); histos.fill(HIST("hOrbitFDDVertex"), orbit - minOrbit); + histos.fill(HIST("FDD/hCounts"), 1); + histos.fill(HIST("FDD/bcVertexTrigger"), localBC); if (bcPatternB[localBC]) { histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds