From e0aea0887c757392b22abeecc29b594e1ff74faf Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 14 Oct 2025 16:46:48 +0200 Subject: [PATCH 1/6] Update propagationServiceRun2.cxx non-fatal for ccdb failures --- Common/TableProducer/propagationServiceRun2.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/TableProducer/propagationServiceRun2.cxx b/Common/TableProducer/propagationServiceRun2.cxx index 9c7765280c0..a2075355200 100644 --- a/Common/TableProducer/propagationServiceRun2.cxx +++ b/Common/TableProducer/propagationServiceRun2.cxx @@ -91,6 +91,7 @@ struct propagationServiceRun2 { ccdb->setCaching(true); ccdb->setLocalObjectValidityChecking(); ccdb->setURL(ccdburl.value); + ccdb->setFatalWhenNull(false); // task-specific strangenessBuilderModule.init(baseOpts, v0BuilderOpts, cascadeBuilderOpts, preSelectOpts, histos, initContext); From c672f8ab4cf7d388a9d2fda9c45aa4dce9216526 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 14 Oct 2025 16:47:31 +0200 Subject: [PATCH 2/6] Add GRPObject path (for Run 2) --- Common/Tools/StandardCCDBLoader.h | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Common/Tools/StandardCCDBLoader.h b/Common/Tools/StandardCCDBLoader.h index b215fc70569..85989207d7e 100644 --- a/Common/Tools/StandardCCDBLoader.h +++ b/Common/Tools/StandardCCDBLoader.h @@ -81,6 +81,27 @@ class StandardCCDBLoader return; } + grpmag = ccdb->template getForRun(cGroup.grpmagPath.value, currentRunNumber); + if(grpmag){ + LOG(info) << "Setting global propagator magnetic field to current " << grpmag->getL3Current() << " A for run " << currentRunNumber << " from its GRPMagField CCDB object"; + o2::base::Propagator::initFieldFromGRP(grpmag); + }else{ + LOGF(info, "GRPMagField object returned nullptr, will attempt alternate method"); + + o2::parameters::GRPObject* grpo = 0x0; + grpo = ccdb->template getForRun(cGroup.grpPath.value, currentRunNumber); + if (!grpo) { + LOG(fatal) << "Alternate path failed! Got nullptr from CCDB for path " << cGroup.grpPath << " of object GRPObject for run " << currentRunNumber; + } + o2::base::Propagator::initFieldFromGRP(grpo); + } + if (getMeanVertex) { + // only try this if explicitly requested + mMeanVtx = ccdb->template getForRun(cGroup.mVtxPath.value, currentRunNumber); + } else { + mMeanVtx = nullptr; + } + // load matLUT for this timestamp if (!lut) { LOG(info) << "Loading material look-up table for timestamp: " << currentRunNumber; @@ -88,18 +109,8 @@ class StandardCCDBLoader } else { LOG(info) << "Material look-up table already in place. Not reloading."; } - - grpmag = ccdb->template getForRun(cGroup.grpmagPath.value, currentRunNumber); - LOG(info) << "Setting global propagator magnetic field to current " << grpmag->getL3Current() << " A for run " << currentRunNumber << " from its GRPMagField CCDB object"; - o2::base::Propagator::initFieldFromGRP(grpmag); LOG(info) << "Setting global propagator material propagation LUT"; o2::base::Propagator::Instance()->setMatLUT(lut); - if (getMeanVertex) { - // only try this if explicitly requested - mMeanVtx = ccdb->template getForRun(cGroup.mVtxPath.value, currentRunNumber); - } else { - mMeanVtx = nullptr; - } runNumber = currentRunNumber; } From 27dd239e185420b309f8522c0cec03e60d3579b6 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Tue, 14 Oct 2025 16:52:39 +0200 Subject: [PATCH 3/6] Please consider the following formatting changes (#487) --- Common/Tools/StandardCCDBLoader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Tools/StandardCCDBLoader.h b/Common/Tools/StandardCCDBLoader.h index 85989207d7e..b786988da48 100644 --- a/Common/Tools/StandardCCDBLoader.h +++ b/Common/Tools/StandardCCDBLoader.h @@ -82,10 +82,10 @@ class StandardCCDBLoader } grpmag = ccdb->template getForRun(cGroup.grpmagPath.value, currentRunNumber); - if(grpmag){ + if (grpmag) { LOG(info) << "Setting global propagator magnetic field to current " << grpmag->getL3Current() << " A for run " << currentRunNumber << " from its GRPMagField CCDB object"; o2::base::Propagator::initFieldFromGRP(grpmag); - }else{ + } else { LOGF(info, "GRPMagField object returned nullptr, will attempt alternate method"); o2::parameters::GRPObject* grpo = 0x0; From 2ca4a18c2b04d4571a8131b7f0eb62a83d43f5fd Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 14 Oct 2025 17:09:21 +0200 Subject: [PATCH 4/6] Update StandardCCDBLoader.h --- Common/Tools/StandardCCDBLoader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Tools/StandardCCDBLoader.h b/Common/Tools/StandardCCDBLoader.h index b786988da48..e5005bb24a0 100644 --- a/Common/Tools/StandardCCDBLoader.h +++ b/Common/Tools/StandardCCDBLoader.h @@ -43,6 +43,7 @@ struct StandardCCDBLoaderConfigurables : o2::framework::ConfigurableGroup { o2::framework::Configurable ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"}; o2::framework::Configurable lutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"}; o2::framework::Configurable grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; + o2::framework::Configurable grpPath{"grpPath", "GLO/GRP/GRP", "Path of the grp file"}; o2::framework::Configurable mVtxPath{"mVtxPath", "GLO/Calib/MeanVertex", "Path of the mean vertex file"}; }; From 82d979ee91ca25518f1ea313fcf03b964b701476 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 14 Oct 2025 19:13:51 +0200 Subject: [PATCH 5/6] Update StandardCCDBLoader.h --- Common/Tools/StandardCCDBLoader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Tools/StandardCCDBLoader.h b/Common/Tools/StandardCCDBLoader.h index e5005bb24a0..d79d00804bf 100644 --- a/Common/Tools/StandardCCDBLoader.h +++ b/Common/Tools/StandardCCDBLoader.h @@ -17,6 +17,7 @@ #define COMMON_TOOLS_STANDARDCCDBLOADER_H_ #include +#include #include #include #include From 0d29bd7843822d70462641e6223e2320adb17ddb Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Tue, 14 Oct 2025 19:25:52 +0200 Subject: [PATCH 6/6] Please consider the following formatting changes (#488) --- Common/Tools/StandardCCDBLoader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Tools/StandardCCDBLoader.h b/Common/Tools/StandardCCDBLoader.h index d79d00804bf..058342ce527 100644 --- a/Common/Tools/StandardCCDBLoader.h +++ b/Common/Tools/StandardCCDBLoader.h @@ -17,8 +17,8 @@ #define COMMON_TOOLS_STANDARDCCDBLOADER_H_ #include -#include #include +#include #include #include #include