From 7dfd6bebadbd91f51e4a9d99ecfcdef9ed347b08 Mon Sep 17 00:00:00 2001
From: Olga Igonkina <olga.igonkina@cern.ch>
Date: Tue, 23 Oct 2018 09:49:16 +0000
Subject: [PATCH] Merge branch '21.1-dev-test' into '21.1-dev'
Circumvent problem with the TrigDecisionTool Feature retrieval
See merge request atlas/athena!15243
(cherry picked from commit 2dd21e2a49ed12c424032996e5a49c602873be06)
dc7f6545 Circumvent problem with the TrigDecisionTool Feature retrieval
---
Control/AthenaConfiguration/python/iconfTool/gui/__init__.py | 0
Control/AthenaConfiguration/python/iconfTool/utils/__init__.py | 0
Control/AthenaKernel/share/ClassName_test.ref | 0
.../TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx | 2 ++
4 files changed, 2 insertions(+)
mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
mode change 100755 => 100644 Control/AthenaKernel/share/ClassName_test.ref
diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
old mode 100644
new mode 100755
diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py b/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
old mode 100644
new mode 100755
diff --git a/Control/AthenaKernel/share/ClassName_test.ref b/Control/AthenaKernel/share/ClassName_test.ref
old mode 100755
new mode 100644
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
index 9d8bcca3926..ce8d51787a6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
@@ -1199,6 +1199,8 @@ void AnalysisConfig_Ntuple::loop() {
// std::cout << "decidion type " << decisiontype << std::endl;
#endif
+ /// if the chain did not pass, skip this chain completely
+ if ( !(*m_tdt)->isPassed( chainName, _decisiontype ) ) continue;
// Get chain combinations and loop on them
// - loop made on chain selected as the one steering RoI creation
--
GitLab