Reducing the search window used to find the max in the ADC samples. Needed because...

[u/mrichter/AliRoot.git] / PHOS / AliPHOSTrackSegmentMakerv2.cxx

diff --git a/PHOS/AliPHOSTrackSegmentMakerv2.cxx b/PHOS/AliPHOSTrackSegmentMakerv2.cxx
index c5b325777a8a1fb27a2d2640b8a61aacfb2eb3ec..b74ef43d5ab009ba02df542d76b643b8db1e3095 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv2.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv2.cxx
@@ -76,7 +76,8 @@
 #include "AliPHOSTrackSegmentMakerv2.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSLink.h"
-#include "AliPHOSGetter.h"
+#include "AliPHOSEmcRecPoint.h"
+#include "AliPHOSCpvRecPoint.h"
 
 #include "AliESDEvent.h"
 #include "AliESDtrack.h"
@@ -100,6 +101,8 @@ AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2() :
   fTrackSegments(NULL)
 {
   // default ctor (to be used mainly by Streamer)
+
+  for(Int_t i=0; i<5; i++)fNtpcTracks[i]=0 ;
   InitParameters() ; 
 }
 
@@ -119,6 +122,8 @@ AliPHOSTrackSegmentMakerv2::AliPHOSTrackSegmentMakerv2(AliPHOSGeometry *geom) :
   fTrackSegments(NULL)
 {
   // ctor
+  for(Int_t i=0; i<5; i++)fNtpcTracks[i]=0 ;
+
   InitParameters() ; 
   Init() ;
   fESD = 0;
@@ -167,7 +172,7 @@ void  AliPHOSTrackSegmentMakerv2::FillOneModule()
   //First EMC clusters
   Int_t totalEmc = fEMCRecPoints->GetEntriesFast() ;
   for(fEmcFirst = fEmcLast; (fEmcLast < totalEmc) &&  
-       ((dynamic_cast<AliPHOSRecPoint *>(fEMCRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); 
+       ((static_cast<AliPHOSRecPoint *>(fEMCRecPoints->At(fEmcLast)))->GetPHOSMod() == fModule ); 
       fEmcLast ++)  ;
   
   //Now TPC tracks
@@ -289,7 +294,7 @@ void  AliPHOSTrackSegmentMakerv2::MakeLinks()
   
   Int_t iEmcRP;
   for(iEmcRP = fEmcFirst; iEmcRP < fEmcLast; iEmcRP++ ) {
-    emcclu = dynamic_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(iEmcRP)) ;
+    emcclu = static_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(iEmcRP)) ;
     TVector3 vecEmc ;
     emcclu->GetLocalPosition(vecEmc) ;
     Int_t mod=emcclu->GetPHOSMod() ;
@@ -320,8 +325,11 @@ void  AliPHOSTrackSegmentMakerv2::MakePairs()
 
   //Make arrays to mark clusters already chosen
   Int_t * emcExist = 0;
+
   if(fEmcLast > fEmcFirst)
     emcExist = new Int_t[fEmcLast-fEmcFirst] ;
+  else
+    AliFatal(Form("fEmcLast > fEmcFirst: %d > %d is not true!",fEmcLast,fEmcFirst));
   
   Int_t index;
   for(index = 0; index <fEmcLast-fEmcFirst; index ++)
@@ -352,10 +360,10 @@ void  AliPHOSTrackSegmentMakerv2::MakePairs()
          Float_t dx,dz ; 
          linkUp->GetXZ(dx,dz) ;
         new ((* fTrackSegments)[fNTrackSegments]) 
-          AliPHOSTrackSegment(dynamic_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(linkUp->GetEmc())) , 
+          AliPHOSTrackSegment(static_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(linkUp->GetEmc())) , 
                               nullpointer,
                               linkUp->GetTrack(),dx,dz) ;
-       (dynamic_cast<AliPHOSTrackSegment *>(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments);
+       (static_cast<AliPHOSTrackSegment *>(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments);
        fNTrackSegments++ ;
        emcExist[linkUp->GetEmc()-fEmcFirst] = -1 ; //Mark emc  that Cpv was found 
        //mark track as already used 
@@ -370,9 +378,9 @@ void  AliPHOSTrackSegmentMakerv2::MakePairs()
     for(iEmcRP = 0; iEmcRP < fEmcLast-fEmcFirst  ; iEmcRP++ ){
       if(emcExist[iEmcRP] > 0 ){
        new ((*fTrackSegments)[fNTrackSegments])  
-         AliPHOSTrackSegment(dynamic_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(iEmcRP+fEmcFirst)), 
+         AliPHOSTrackSegment(static_cast<AliPHOSEmcRecPoint *>(fEMCRecPoints->At(iEmcRP+fEmcFirst)), 
                            nullpointer) ;
-       (dynamic_cast<AliPHOSTrackSegment *>(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments);
+       (static_cast<AliPHOSTrackSegment *>(fTrackSegments->At(fNTrackSegments)))->SetIndexInList(fNTrackSegments);
        fNTrackSegments++;    
       } 
     }