From d1cb0d78b828f28d98e32afa7b46c4ea18686862 Mon Sep 17 00:00:00 2001
From: Imma Riu <imma.riu@cern.ch>
Date: Tue, 5 Sep 2017 15:37:47 +0000
Subject: [PATCH] Merge branch '21.1-fixmsg-l1topo' into '21.1'
Change TRG_MSG_ALWAYS -> TRG_MSG_INFO, fixes ATR-16951
See merge request !4441
(cherry picked from commit 8eedbb507784bfcdb55b430417598449ff02462b [formerly 8e80a98f5ae3cc9a73a10d0bce6d803caa474022])
f7e10ddb Change TRG_MSG_ALWAYS -> TRG_MSG_INFO, fixes ATR-16951
a85a1588 MSG_INFO --> MSG_DEBUG
Former-commit-id: 416d684a96ada087e0c386f6358961177fa22079
---
Control/AthViews/test/ViewCollectionMerge_test.txt | 0
.../test_athena_ntuple_dumper_novarhandles.ref | 0
...est_athena_ntuple_dumper_varhandles_nooutput.ref | 0
.../share/test_athena_variable_shape1.ref | 0
Event/xAOD/xAODCore/share/inc_AddDVProxy.ref | 0
.../share/LUT_mc12.root | Bin
.../L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx | 8 +++-----
7 files changed, 3 insertions(+), 5 deletions(-)
mode change 100644 => 100755 Control/AthViews/test/ViewCollectionMerge_test.txt
mode change 100644 => 100755 Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_novarhandles.ref
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 100644 => 100755 Event/xAOD/xAODCore/share/inc_AddDVProxy.ref
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/Control/AthViews/test/ViewCollectionMerge_test.txt b/Control/AthViews/test/ViewCollectionMerge_test.txt
old mode 100644
new mode 100755
diff --git a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_novarhandles.ref b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_novarhandles.ref
old mode 100644
new mode 100755
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/Event/xAOD/xAODCore/share/inc_AddDVProxy.ref b/Event/xAOD/xAODCore/share/inc_AddDVProxy.ref
old mode 100644
new mode 100755
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
diff --git a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
index 58f6de62f07..4b775c09862 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoCoreSim/Root/TopoSteering.cxx
@@ -321,9 +321,8 @@ TopoSteering::executeSortingAlgorithm(TCS::SortingAlg *alg,
TCS::InputConnector* inputConnector,
TCS::TOBArray * & sortedOutput) {
- //TRG_MSG_DEBUG
- TRG_MSG_ALWAYS(" ... executing sorting alg '" << alg->fullname() << "'"
- <<(m_useBitwise?" (bitwise)":""));
+ TRG_MSG_DEBUG(" ... executing sorting alg '" << alg->fullname() << "'"
+ <<(m_useBitwise?" (bitwise)":""));
const InputTOBArray * input = inputConnector->outputData();
@@ -341,8 +340,7 @@ TopoSteering::executeDecisionAlgorithm(TCS::DecisionAlg *alg,
const std::vector<TCS::TOBArray *> & output,
TCS::Decision & decision) {
- // TRG_MSG_INFO(" ... executing decision alg '" << alg->fullname() << "'");
- TRG_MSG_ALWAYS(" ... executing decision alg '" << alg->fullname() << "'"
+ TRG_MSG_DEBUG(" ... executing decision alg '" << alg->fullname() << "'"
<<(m_useBitwise?" (bitwise)":""));
if(inputConnectors.size()<1) {
--
GitLab