From f3ad84fe487cdcd0e4a9ff87fa5e12b61a5ceb00 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Mon, 16 Feb 2026 18:51:48 +0100 Subject: [PATCH 1/2] [PWGDQ] Throwing fatal in case Zshift CCDB object not found --- PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx | 6 ++++-- PWGDQ/TableProducer/tableMaker_withAssoc.cxx | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx index 441287b2de0..3674fec8b67 100644 --- a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx @@ -215,7 +215,7 @@ struct TableMakerMC { Configurable fGeoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"}; Configurable fGrpMagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; Configurable fZShiftPath{"zShiftPath", "Users/m/mcoquet/ZShift", "CCDB path for z shift to apply to forward tracks"}; - Configurable fUseRemoteZShift{"cfgUseRemoteZShift", true, "Enable getting Zshift from ccdb"}; + Configurable fUseRemoteZShift{"cfgUseRemoteZShift", false, "Enable getting Zshift from ccdb"}; Configurable fManualZShift{"cfgManualZShift", 0.f, "Manual value for the Zshift for muons."}; Configurable fGrpMagPathRun2{"grpmagPathRun2", "GLO/GRP/GRP", "CCDB path of the GRPObject (Usage for Run 2)"}; Configurable timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB"}; @@ -1204,7 +1204,9 @@ struct TableMakerMC { auto* fZShift = fCCDB->getForTimeStamp>(fConfigCCDB.fZShiftPath, bcs.begin().timestamp()); if (fZShift != nullptr && !fZShift->empty()) { VarManager::SetZShift((*fZShift)[0]); - } + } else { + LOG(fatal) << "Could not retrieve Z-shift value from CCDB"; + } } else { VarManager::SetZShift(fConfigCCDB.fManualZShift.value); } diff --git a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx index dcdc55e61c4..2c584cea5c9 100644 --- a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx @@ -254,7 +254,7 @@ struct TableMaker { Configurable fConfigGeoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"}; Configurable fConfigGrpMagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; Configurable fZShiftPath{"zShiftPath", "Users/m/mcoquet/ZShift", "CCDB path for z shift to apply to forward tracks"}; - Configurable fUseRemoteZShift{"cfgUseRemoteZShift", true, "Enable getting Zshift from ccdb"}; + Configurable fUseRemoteZShift{"cfgUseRemoteZShift", false, "Enable getting Zshift from ccdb"}; Configurable fManualZShift{"cfgManualZShift", 0.f, "Manual value for the Zshift for muons."}; Configurable fConfigGrpMagPathRun2{"grpmagPathRun2", "GLO/GRP/GRP", "CCDB path of the GRPObject (Usage for Run 2)"}; } fConfigCCDB; @@ -1584,7 +1584,9 @@ struct TableMaker { auto* fZShift = fCCDB->getForTimeStamp>(fConfigCCDB.fZShiftPath, bcs.begin().timestamp()); if (fZShift != nullptr && !fZShift->empty()) { VarManager::SetZShift((*fZShift)[0]); - } + } else { + LOG(fatal) << "Could not retrieve Z-shift value from CCDB"; + } } else { VarManager::SetZShift(fConfigCCDB.fManualZShift.value); } From 16a8e5883f4afb9fbcd2cf3467c9dfea52ae0b81 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Mon, 16 Feb 2026 18:53:27 +0100 Subject: [PATCH 2/2] clang format --- PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx | 2 +- PWGDQ/TableProducer/tableMaker_withAssoc.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx index 3674fec8b67..6223c178012 100644 --- a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx @@ -1206,7 +1206,7 @@ struct TableMakerMC { VarManager::SetZShift((*fZShift)[0]); } else { LOG(fatal) << "Could not retrieve Z-shift value from CCDB"; - } + } } else { VarManager::SetZShift(fConfigCCDB.fManualZShift.value); } diff --git a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx index 2c584cea5c9..82281c8961d 100644 --- a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx @@ -1586,7 +1586,7 @@ struct TableMaker { VarManager::SetZShift((*fZShift)[0]); } else { LOG(fatal) << "Could not retrieve Z-shift value from CCDB"; - } + } } else { VarManager::SetZShift(fConfigCCDB.fManualZShift.value); }