From 3c60879cb65c0ddb6be6c7c8cfa539150f726b5b Mon Sep 17 00:00:00 2001 From: Alberto Caliva Date: Mon, 28 Jul 2025 16:59:13 +0200 Subject: [PATCH 1/2] Fix: apply global density scaling factor in MaterialManager::getDensity --- Detectors/Base/src/MaterialManager.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Detectors/Base/src/MaterialManager.cxx b/Detectors/Base/src/MaterialManager.cxx index 741b69d019871..12420099bd933 100644 --- a/Detectors/Base/src/MaterialManager.cxx +++ b/Detectors/Base/src/MaterialManager.cxx @@ -129,9 +129,11 @@ float MaterialManager::getDensity(std::string const& modname) initDensityMap(); } if (mDensityMap.find(modname) != mDensityMap.end()) { - return mDensityMap[modname]; + return o2::conf::SimMaterialParams::Instance().globalDensityFactor * mDensityMap[modname]; } - return o2::conf::SimMaterialParams::Instance().globalDensityFactor; + LOG(warning) << "MaterialManager::getDensity: Material '" << modname + << "' not found in density map. Returning 0."; + return 0.0; } void MaterialManager::Material(const char* modname, Int_t imat, const char* name, Float_t a, Float_t z, Float_t dens, From 4c000399471f6f06c3520f3fb3262f1b208a3d3e Mon Sep 17 00:00:00 2001 From: Alberto Caliva Date: Mon, 28 Jul 2025 17:03:36 +0200 Subject: [PATCH 2/2] fixed whitespace --- Detectors/Base/src/MaterialManager.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Detectors/Base/src/MaterialManager.cxx b/Detectors/Base/src/MaterialManager.cxx index 12420099bd933..d3debca887d10 100644 --- a/Detectors/Base/src/MaterialManager.cxx +++ b/Detectors/Base/src/MaterialManager.cxx @@ -131,8 +131,7 @@ float MaterialManager::getDensity(std::string const& modname) if (mDensityMap.find(modname) != mDensityMap.end()) { return o2::conf::SimMaterialParams::Instance().globalDensityFactor * mDensityMap[modname]; } - LOG(warning) << "MaterialManager::getDensity: Material '" << modname - << "' not found in density map. Returning 0."; + LOG(warning) << "MaterialManager::getDensity: Material '" << modname << "' not found in density map. Returning 0."; return 0.0; }