From c5f97593a0ceb070c99c991c2f2d01f419018569 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Wed, 16 Jan 2019 11:10:57 +0000
Subject: [PATCH] Merge branch 'cherry-pick-526faae9f7-21.3' into '21.3'
Sweeping !20329 from 21.1 to 21.3.
Fix hang due to unfortunate convergence of input settings
See merge request atlas/athena!20358
(cherry picked from commit 22dfd26895fbe4cdae86ff9ee48f33175510fd21)
c2e6ed2c Merge branch '21.1-zf' into '21.1'
---
.../IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h | 4 ++--
Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
index f707372dfe0..24b385ddddc 100755
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
@@ -18,8 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
-#ifndef __TRIGZFINDERINTERNAL_H__
-#define __TRIGZFINDERINTERNAL_H__
+#ifndef TRIGZFINDERINTERNAL_H
+#define TRIGZFINDERINTERNAL_H
#include <cmath>
#include <vector>
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
index 7d831b77a81..309d83646af 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
@@ -639,7 +639,7 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
zHisto[bending][bestPhi][binMax-1] ) /maxh;
/// if found a vertex flag the bins so we don't use them again
- if ( m_numberOfPeaks>1 ) {
+ if ( m_numberOfPeaks>0 ) {
nHisto[bending][bestPhi][binMax] = -1;
nHisto[bending][bestPhi][binMax-1] = -1;
nHisto[bending][bestPhi][binMax+1] = -1;
@@ -669,7 +669,7 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
double significance = 0;
if ( bg>0 ) {
significance = (maxh-bg)/std::sqrt(bg);
- if ( significance < m_minVtxSignificance ) addvtx = false;
+ if ( significance < m_minVtxSignificance ) break; // if this vertex is not significant then no subsequent vertex could be either
}
if ( addvtx ) {
--
GitLab