Merge branch 'cherry-pick-8e80a98f' into 'master'

Merge branch '21.1-fixmsg-l1topo' into '21.1' Closes ATR-16951 See merge request atlas/athena!10005

Merge branch 'cherry-pick-8e80a98f' into 'master'
Merge branch '21.1-fixmsg-l1topo' into '21.1' Closes ATR-16951 See merge request atlas/athena!10005
eb03595b · Vakhtang Tsulaia · c8bdb6d8 · 416d684a · eb03595b · eb03595b
Commit eb03595b authored 6 years ago by Vakhtang Tsulaia
--- a/Control/AthViews/test/ViewCollectionMerge_test.txt
+++ b/Control/AthViews/test/ViewCollectionMerge_test.txt
--- a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_novarhandles.ref
+++ b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_novarhandles.ref
--- a/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref
+++ b/Database/AthenaRoot/AthenaRootComps/share/test_athena_ntuple_dumper_varhandles_nooutput.ref
--- a/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref
+++ b/Database/AthenaRoot/AthenaRootComps/share/test_athena_variable_shape1.ref
--- a/Event/xAOD/xAODCore/share/inc_AddDVProxy.ref
+++ b/Event/xAOD/xAODCore/share/inc_AddDVProxy.ref
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
--- 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_DEBUG("  ... executing sorting alg '" << alg->fullname() << "'"
-    TRG_MSG_ALWAYS("  ... executing sorting alg '" << alg->fullname() << "'"
+                  <<(m_useBitwise?" (bitwise)":""));
-                   <<(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_DEBUG("  ... executing decision alg '" << alg->fullname() << "'"
-   TRG_MSG_ALWAYS("  ... executing decision alg '" << alg->fullname() << "'"
                  <<(m_useBitwise?" (bitwise)":""));
   if(inputConnectors.size()<1) {