From b4afd164d54dd185a85b5f5965d612875b98553c Mon Sep 17 00:00:00 2001
From: Brendon Bullard <brendon.aurele.bullard@cern.ch>
Date: Mon, 7 Sep 2020 19:05:54 +0000
Subject: [PATCH] MagneticField: Search CALIBPATH for BField map in
AtlasFieldMapCondAlg.cxx
---
MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx | 4 ++--
MagneticField/MagFieldServices/src/AtlasFieldSvc.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx b/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
index c60f448f33e..4726d17f0d7 100644
--- a/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
+++ b/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
@@ -340,9 +340,9 @@ MagField::AtlasFieldMapCondAlg::updateFieldMap(const EventContext& ctx, Cache& c
// find the path to the map file
- std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "CALIBPATH" );
if ( resolvedMapFile.empty() ) {
- ATH_MSG_ERROR( "updateFieldMap: Field map file " << mapFile << " not found" );
+ ATH_MSG_ERROR( "Field map file " << mapFile << " not found" );
return StatusCode::FAILURE;
}
// Do checks and extract root file to initialize the map
diff --git a/MagneticField/MagFieldServices/src/AtlasFieldSvc.cxx b/MagneticField/MagFieldServices/src/AtlasFieldSvc.cxx
index 9bb04bfd109..883c5901c23 100644
--- a/MagneticField/MagFieldServices/src/AtlasFieldSvc.cxx
+++ b/MagneticField/MagFieldServices/src/AtlasFieldSvc.cxx
@@ -391,7 +391,7 @@ StatusCode MagField::AtlasFieldSvc::initializeMap(AtlasFieldSvcTLS &tls)
return StatusCode::SUCCESS;
}
// find the path to the map file
- std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "CALIBPATH" );
if ( resolvedMapFile.empty() ) {
ATH_MSG_ERROR( "Field map file " << mapFile << " not found" );
return StatusCode::FAILURE;
--
GitLab