ExecuteEvent()const added

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

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 7d870c655ec97616faaca7f03fe4228add791968..7ccbf5189d0ff2b47b6060f0dd26b6d0325e9c00 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -25,8 +25,6 @@
 #include "TClonesArray.h"
 
 // --- Standard library ---
-#include <iostream.h>
-#include <stdio.h>
 
 // --- AliRoot header files ---
 
@@ -88,7 +86,7 @@ Int_t AliPHOSRecPoint::DistancetoPrimitive(Int_t px, Int_t py)
  }
 
 //______________________________________________________________________________
-void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
+void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const
 {
   // Execute action corresponding to one event
   // This member function is called when a AliPHOSRecPoint is clicked with the locator
@@ -119,8 +117,7 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py)
     Float_t * zi = new Float_t [kMulDigit] ;
     
     for(iDigit = 0; iDigit < kMulDigit; iDigit++) {
-      cout << " AliPHOSRecPoint::ExecuteEvent -> Something wromg with the code" << endl ; 
-      abort() ; 
+      Fatal("AliPHOSRecPoint::ExecuteEvent", "-> Something wrong with the code"); 
       digit = 0 ; //dynamic_cast<AliPHOSDigit *>((fDigitsList)[iDigit]);
       phosgeom->AbsToRelNumbering(digit->GetId(), relid) ;
       phosgeom->RelPosInModule(relid, xi[iDigit], zi[iDigit]) ;
@@ -202,42 +199,44 @@ void  AliPHOSRecPoint::EvalPrimaries(TClonesArray * digits)
   for ( index = 0 ; index < GetDigitsMultiplicity() ; index++ ) { // all digits
     digit = dynamic_cast<AliPHOSDigit *>(digits->At( fDigitsList[index] )) ; 
     Int_t nprimaries = digit->GetNprimary() ;
-    Int_t * newprimaryarray = new Int_t[nprimaries] ;
-    Int_t ii ; 
-    for ( ii = 0 ; ii < nprimaries ; ii++)
-      newprimaryarray[ii] = digit->GetPrimary(ii+1) ; 
+    if(nprimaries){
+      Int_t * newprimaryarray = new Int_t[nprimaries] ;
+      Int_t ii ; 
+      for ( ii = 0 ; ii < nprimaries ; ii++)
+       newprimaryarray[ii] = digit->GetPrimary(ii+1) ; 
 
-    Int_t jndex ;
-    for ( jndex = 0 ; jndex < nprimaries ; jndex++ ) { // all primaries in digit
-      if ( fMulTrack > fMaxTrack ) {
-       fMulTrack = - 1 ;
-       cout << "AliPHOSRecPoint::GetNprimaries ERROR > increase fMaxTrack " << endl ;
-       break ;
-      }
-      Int_t newprimary = newprimaryarray[jndex] ;
-      Int_t kndex ;
-      Bool_t already = kFALSE ;
-      for ( kndex = 0 ; kndex < fMulTrack ; kndex++ ) { //check if not already stored
-       if ( newprimary == tempo[kndex] ){
-         already = kTRUE ;
+      Int_t jndex ;
+      for ( jndex = 0 ; jndex < nprimaries ; jndex++ ) { // all primaries in digit
+       if ( fMulTrack > fMaxTrack ) {
+         fMulTrack = - 1 ;
+         Error("EvalPrimaries", "GetNprimaries ERROR > increase fMaxTrack" ) ;
          break ;
        }
-      } // end of check
-      if ( !already) { // store it
-       tempo[fMulTrack] = newprimary ; 
-       fMulTrack++ ;
-      } // store it
-    } // all primaries in digit
-    delete newprimaryarray ; 
+       Int_t newprimary = newprimaryarray[jndex] ;
+       Int_t kndex ;
+       Bool_t already = kFALSE ;
+       for ( kndex = 0 ; kndex < fMulTrack ; kndex++ ) { //check if not already stored
+         if ( newprimary == tempo[kndex] ){
+           already = kTRUE ;
+           break ;
+         }
+       } // end of check
+       if ( !already) { // store it
+         tempo[fMulTrack] = newprimary ; 
+         fMulTrack++ ;
+       } // store it
+      } // all primaries in digit
+      delete [] newprimaryarray ; 
+    }
   } // all digits
 
-  
-  fTracksList = new Int_t[fMulTrack] ;
+  if(fMulTrack)
+    fTracksList = new Int_t[fMulTrack] ;
   for(index = 0; index < fMulTrack; index++)
-   fTracksList[index] = tempo[index] ;
- 
-  delete tempo ;
-
+    fTracksList[index] = tempo[index] ;
+  
+  delete [] tempo ;
+  
 }
 //____________________________________________________________________________
 void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const