From 86a464b35d0cebf3d0c8e243ee18fa972c41d767 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Tue, 28 Nov 2017 11:22:17 +0000
Subject: [PATCH] Merge branch 'cherry-pick-49a2623b' into '21.0-mc16d'
Merge branch 'ATLASRECTS-3964' into '21.0-mc16d'
See merge request atlas/athena!6883
(cherry picked from commit b87233a9a3ca27c72b3b945fde851d81842d7423)
d0bc12aa Merge branch 'ATLASRECTS-3964' into '21.0'
---
Control/AthAllocators/AthAllocators/ATLAS_CHECK_THREAD_SAFETY | 0
Control/SGMon/SGAudCore/SGAudCore/ATLAS_CHECK_THREAD_SAFETY | 0
.../share/test_athena_ntuple_dumper_varhandles_nooutput.ref | 0
.../AthenaRootComps/share/test_athena_variable_shape1.ref | 0
.../AthenaRootComps/share/test_athena_variable_shape2.ref | 0
.../AthenaRootComps/share/test_athena_variable_shape3.ref | 0
.../MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx | 2 +-
7 files changed, 1 insertion(+), 1 deletion(-)
mode change 100755 => 100644 Control/AthAllocators/AthAllocators/ATLAS_CHECK_THREAD_SAFETY
mode change 100755 => 100644 Control/SGMon/SGAudCore/SGAudCore/ATLAS_CHECK_THREAD_SAFETY
mode change 100755 => 100644 Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref
mode change 100755 => 100644 Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref
mode change 100755 => 100644 Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref
mode change 100755 => 100644 Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape3.ref
diff --git a/Control/AthAllocators/AthAllocators/ATLAS_CHECK_THREAD_SAFETY b/Control/AthAllocators/AthAllocators/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Control/SGMon/SGAudCore/SGAudCore/ATLAS_CHECK_THREAD_SAFETY b/Control/SGMon/SGAudCore/SGAudCore/ATLAS_CHECK_THREAD_SAFETY
old mode 100755
new mode 100644
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref
old mode 100755
new mode 100644
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref
old mode 100755
new mode 100644
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape2.ref
old mode 100755
new mode 100644
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape3.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape3.ref
old mode 100755
new mode 100644
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx
index 8513baba1c9..fe8bf0d7fbc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx
@@ -806,7 +806,7 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr
}else{
exPars = m_extrapolator->extrapolateDirectly(pars,surf,Trk::anyDirection,false,Trk::muon);
if( !exPars ) {
- ATH_MSG_WARNING(" Propagation cluster hole failed!! ");
+ ATH_MSG_DEBUG(" Propagation cluster hole failed!! ");
continue;
}
parsToBeDeleted.push_back(exPars);
--
GitLab