From 0d8c8347a35f8f622edf68d31837d756e0b10085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 2 Apr 2026 16:06:46 +0200 Subject: [PATCH] Fix compilation errors in macros --- Common/CCDB/macros/ctpRateF.C | 6 ++-- .../macros/upload_event_selection_params.C | 30 +++++++++---------- Common/Core/macros/testMetadataHelper.C | 5 ++-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Common/CCDB/macros/ctpRateF.C b/Common/CCDB/macros/ctpRateF.C index 32b93e4aa6b..7890033cb3a 100644 --- a/Common/CCDB/macros/ctpRateF.C +++ b/Common/CCDB/macros/ctpRateF.C @@ -52,7 +52,7 @@ void ctpRateFetcher::getCTPconfig(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim if (runNumber == mRunNumber && mConfig != nullptr) { return; } - std::map metadata; + std::map metadata; metadata["runNumber"] = std::to_string(runNumber); mConfig = ccdb->getSpecific("CTP/Config/Config", timeStamp, metadata); if (mConfig == nullptr) { @@ -64,7 +64,7 @@ void ctpRateFetcher::getLHCIFdata(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim if (runNumber == mRunNumber && mLHCIFdata != nullptr) { return; } - std::map metadata; + std::map metadata; mLHCIFdata = ccdb->getSpecific("GLO/Config/GRPLHCIF", timeStamp, metadata); if (mLHCIFdata == nullptr) { LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp; @@ -75,7 +75,7 @@ void ctpRateFetcher::getCTPscalers(o2::ccdb::BasicCCDBManager* ccdb, uint64_t ti if (runNumber == mRunNumber && mScalers != nullptr) { return; } - std::map metadata; + std::map metadata; metadata["runNumber"] = std::to_string(runNumber); mScalers = ccdb->getSpecific("CTP/Calib/Scalers", timeStamp, metadata); if (mScalers == nullptr) { diff --git a/Common/CCDB/macros/upload_event_selection_params.C b/Common/CCDB/macros/upload_event_selection_params.C index cafc863ab03..cb137bacbfd 100644 --- a/Common/CCDB/macros/upload_event_selection_params.C +++ b/Common/CCDB/macros/upload_event_selection_params.C @@ -84,14 +84,14 @@ void upload_event_selection_params() n++; period[n] = "lhc15f_isolated_bunches"; par[n] = new EventSelectionParams(0); - par[n]->DisableOutOfBunchPileupCuts(); + par[n]->disableOutOfBunchPileupCuts(); runFirst[n] = 225000; runLast[n] = 225719; n++; period[n] = "lhc15f_isolated_bunches2"; par[n] = new EventSelectionParams(0); - par[n]->DisableOutOfBunchPileupCuts(); + par[n]->disableOutOfBunchPileupCuts(); runFirst[n] = 226062; runLast[n] = 226500; @@ -100,12 +100,12 @@ void upload_event_selection_params() par[n] = new EventSelectionParams(0); runFirst[n] = 225753; runLast[n] = 225768; - par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801); + par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801); n++; period[n] = "lhc15f_50ns_trains2_missing_V0C3"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801); + par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801); par[n]->fV0CasymA = 0; par[n]->fV0CasymB = 0; runFirst[n] = 226530; @@ -114,42 +114,42 @@ void upload_event_selection_params() n++; period[n] = "lhc15h"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801); + par[n]->setOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801); runFirst[n] = 232914; runLast[n] = 233859; n++; period[n] = "lhc15h_isolated_bunches"; par[n] = new EventSelectionParams(0); - par[n]->DisableOutOfBunchPileupCuts(); + par[n]->disableOutOfBunchPileupCuts(); runFirst[n] = 233912; runLast[n] = 234050; n++; period[n] = "lhc15i"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201); + par[n]->setOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201); runFirst[n] = 235196; runLast[n] = 236866; n++; period[n] = "lhc15j"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165); + par[n]->setOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165); runFirst[n] = 236892; runLast[n] = 238621; n++; period[n] = "lhc15l"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245); + par[n]->setOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245); runFirst[n] = 239188; runLast[n] = 241544; n++; period[n] = "lhc15n"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104); + par[n]->setOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104); runFirst[n] = 244340; runLast[n] = 244628; @@ -176,7 +176,7 @@ void upload_event_selection_params() n++; period[n] = "lhc16do"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-65.42, 7.43, -5.62, 0.85); + par[n]->setOnVsOfParams(-65.42, 7.43, -5.62, 0.85); runFirst[n] = 252235; runLast[n] = 264035; @@ -201,7 +201,7 @@ void upload_event_selection_params() n++; period[n] = "pp2017"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76); + par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76); runFirst[n] = 270531; runLast[n] = 280140; @@ -214,21 +214,21 @@ void upload_event_selection_params() n++; period[n] = "pp2017pqr"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76); + par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76); runFirst[n] = 282008; runLast[n] = 282704; n++; period[n] = "lhc18b_isolated_bunches"; par[n] = new EventSelectionParams(0); - par[n]->DisableOutOfBunchPileupCuts(); + par[n]->disableOutOfBunchPileupCuts(); runFirst[n] = 284706; runLast[n] = 285015; n++; period[n] = "lhc18b_trains"; par[n] = new EventSelectionParams(0); - par[n]->SetOnVsOfParams(-65., 4.3, -5.62, 0.85); + par[n]->setOnVsOfParams(-65., 4.3, -5.62, 0.85); runFirst[n] = 285064; runLast[n] = 285203; diff --git a/Common/Core/macros/testMetadataHelper.C b/Common/Core/macros/testMetadataHelper.C index 27371aaf0e3..fcd79f0a491 100644 --- a/Common/Core/macros/testMetadataHelper.C +++ b/Common/Core/macros/testMetadataHelper.C @@ -120,8 +120,9 @@ std::map buildMapForCommitHash(const std::string& hash) return results; } -void populateCCDBWithCommitAvailability(std::map hasHashMap, - const std::string commitHash const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/") +void populateCCDBWithCommitAvailability(std::map hasHashMap, + const std::string commitHash, + const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/") { // First, init the CCDB manager to test if the ccdb is already populated o2::ccdb::CcdbApi api;