fix for Savannah bug #81846

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveTRDData.cxx

diff --git a/EVE/EveDet/AliEveTRDData.cxx b/EVE/EveDet/AliEveTRDData.cxx
index 8beae5e5edbafee0b3875c652cd170d66c7cc6dc..c8b0c3ff1706566c4a13356e177a7630b498e44d 100644 (file)
--- a/EVE/EveDet/AliEveTRDData.cxx
+++ b/EVE/EveDet/AliEveTRDData.cxx
@@ -119,7 +119,7 @@ void AliEveTRDDigits::SetData(AliTRDdigitsManager *digits)
 
       scale = adc[time] < 512 ? adc[time]/512. : 1.;
       AddQuad(c.GetY()-0.5*dy, c.GetZ()-0.5*dz*scale, c.GetX(), dy*0.95, dz*scale);
-      QuadValue(Float_t(adc[time]));
+      QuadValue(Int_t(adc[time]));
       QuadId(new TNamed(Form("ADC %d", adc[time]), Form("det[%3d(%02d_%d_%d)] col[%3d] row[%2d] tb[%2d]", det, sec, stk, ly, col, row, time)));
     } 
   }
@@ -532,10 +532,10 @@ void AliEveTRDTrack::SetStatus(UChar_t s)
       //trk->CookPID();
   
       Int_t species = 0; Float_t pid = 0.;
-      for(Int_t is=0; is<AliPID::kSPECIES; is++) 
+      for(Int_t is=0; is<AliPID::kSPECIES; ++is) 
         if(trk->GetPID(is) > pid){
           pid = trk->GetPID(is);
-          species = is;
+                 species = (AliPID::EParticleType) is;
         }
       switch(species){
       case AliPID::kElectron:
@@ -572,7 +572,7 @@ void AliEveTRDTrack::SetStatus(UChar_t s)
     1.E2*trk->GetPID(2), 1.E2*trk->GetPID(3), 1.E2*trk->GetPID(4), trk->GetLabel()));
 
   if(GetName()){
-    char id[6]; strncpy(id, GetName(), 6); 
+    char id[6]; snprintf(id, 6, "%s", GetName());
     SetName(Form("%s %s", id, AliPID::ParticleName(species)));
   }
 
@@ -583,14 +583,17 @@ void AliEveTRDTrack::SetStatus(UChar_t s)
 //______________________________________________________________________________
 void AliEveTRDTrack::Load(Char_t *what) const
 {
-  TEveElement::List_ci itrklt=BeginChildren();
+// Spread downwards to tracklets the command "what"
+
+  const AliEveTRDTracklet* trklt(NULL);
+  TEveElement::List_ci itrklt=BeginChildren();
   while(itrklt!=EndChildren()){
-    dynamic_cast<const AliEveTRDTracklet*>(*itrklt)->Load(what);
+    if((trklt = dynamic_cast<const AliEveTRDTracklet*>(*itrklt))) trklt->Load(what);
     itrklt++;
   }
 }
 
-
+//______________________________________________________________________________
 AliEveTRDTrackletOnline::AliEveTRDTrackletOnline(AliTRDtrackletMCM *tracklet) :
   TEveLine(),
   fDetector(-1),