Commit c5f97593 authored by John Derek Chapman's avatar John Derek Chapman Committed by Atlas Nightlybuild
Browse files

Merge branch 'cherry-pick-526faae9-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 22dfd268)

c2e6ed2c Merge branch '21.1-zf' into '21.1'
parent a6eb0b4e
......@@ -18,8 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
#ifndef __TRIGZFINDERINTERNAL_H__
#define __TRIGZFINDERINTERNAL_H__
#ifndef TRIGZFINDERINTERNAL_H
#define TRIGZFINDERINTERNAL_H
#include <cmath>
#include <vector>
......
......@@ -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 ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment