Correct overloading of virtual functions in the derived classes (icc)

[u/mrichter/AliRoot.git] / STEER / AliDetector.cxx

diff --git a/STEER/AliDetector.cxx b/STEER/AliDetector.cxx
index f58011d8536cbbbac19d7a7fd7d1136c3a7841d5..71d748b5b2ddc3ef9a386fbd734dfcf045e9f5cc 100644 (file)
--- a/STEER/AliDetector.cxx
+++ b/STEER/AliDetector.cxx
@@ -56,6 +56,8 @@ AliDetector::AliDetector():
   fNhits(0),
   fNdigits(0),
   fBufferSize(1600),
+  fMaxIterHit(0),
+  fCurIterHit(0),
   fHits(0),
   fDigits(0),
   fPoints(0),
@@ -74,6 +76,8 @@ AliDetector::AliDetector(const AliDetector &det):
   fNhits(0),
   fNdigits(0),
   fBufferSize(1600),
+  fMaxIterHit(0),
+  fCurIterHit(0),
   fHits(0),
   fDigits(0),
   fPoints(0),
@@ -90,6 +94,8 @@ AliDetector::AliDetector(const char* name,const char *title):
   fNhits(0),
   fNdigits(0),
   fBufferSize(1600),
+  fMaxIterHit(0),
+  fCurIterHit(0),
   fHits(0),
   fDigits(0),
   fPoints(0),
@@ -161,7 +167,6 @@ TBranch* AliDetector::MakeBranchInTree(TTree *tree, const char* name,
 // 
 //
 //
-// if (GetDebug()>1)
     
  AliDebug(2,Form("Making Branch %s",name));
  if (tree == 0x0) 
@@ -302,7 +307,10 @@ void AliDetector::LoadPoints(Int_t)
   for (Int_t hit=0;hit<nhits;hit++) {
     ahit = dynamic_cast<AliHit*>(fHits->UncheckedAt(hit));
     trk=ahit->GetTrack();
-    if(trk>tracks) AliFatal(Form("Found track number %d, max track %d",trk, tracks));
+    if(trk>tracks) {
+      AliError(Form("Found track number %d, max track %d",trk, tracks));
+      continue;
+    }
     if(ntrk[trk]==limi[trk])
      {
       //