From: cvetan Date: Thu, 3 Jun 2004 16:54:39 +0000 (+0000) Subject: Bug fix in the merging of neighbour eta slice peaks inside the hough transform peak... X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=0d35f308bf53cc6c0f45bd6fa19ea269710c78df;ds=inline Bug fix in the merging of neighbour eta slice peaks inside the hough transform peak finder --- diff --git a/HLT/hough/AliL3HoughMaxFinder.cxx b/HLT/hough/AliL3HoughMaxFinder.cxx index 17ad2b5841e..518ea8b9a87 100644 --- a/HLT/hough/AliL3HoughMaxFinder.cxx +++ b/HLT/hough/AliL3HoughMaxFinder.cxx @@ -953,8 +953,8 @@ void AliL3HoughMaxFinder::FindAdaptedRowPeaks(Int_t kappawindow,Int_t xsize,Int_ for(Int_t j = fN1PeaksPrevEtaSlice; j < fN2PeaksPrevEtaSlice; j++) { if(fWeight[j] < 0) continue; if((fENDETAPeaks[j]-fSTARTETAPeaks[j]) >= 1) continue; - if((maxima[i].start_x >= fSTARTXPeaks[j]-1 && maxima[i].start_x <= fENDXPeaks[j]+1) || (maxima[i].end_x <= fENDXPeaks[j]+1 && maxima[i].end_x >= fSTARTXPeaks[j]-1)) { - if((maxima[i].start_y >= fSTARTYPeaks[j]-1 && maxima[i].start_y <= fENDYPeaks[j]+1) || (maxima[i].end_y <= fENDYPeaks[j]+1 && maxima[i].end_y >= fSTARTYPeaks[j]-1)) { + if((maxima[i].start_x <= fENDXPeaks[j]+1) && (maxima[i].end_x >= fSTARTXPeaks[j]-1)) { + if((maxima[i].start_y <= fENDYPeaks[j]+1) && (maxima[i].end_y >= fSTARTYPeaks[j]-1)) { //merge merged = kTRUE; fXPeaks[fNPeaks] = (hist->GetPreciseBinCenterX(maxima[i].x)+(fENDETAPeaks[j]-fSTARTETAPeaks[j]+1)*fXPeaks[j])/(fENDETAPeaks[j]-fSTARTETAPeaks[j]+2);