Coverity

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

diff --git a/EVE/EveDet/AliEveTRDLoader.cxx b/EVE/EveDet/AliEveTRDLoader.cxx
index d78c9d1f846ab253baf884a832815d204b4f0d79..ffa84ffbfdb18332dcf301379dad9c5ecee9c66b 100644 (file)
--- a/EVE/EveDet/AliEveTRDLoader.cxx
+++ b/EVE/EveDet/AliEveTRDLoader.cxx
@@ -32,12 +32,9 @@
 
 #include "AliTRDhit.h"
 #include "AliTRDcluster.h"
-#include "AliTRDmcmTracklet.h"
 #include "AliTRDdigitsManager.h"
 #include "AliTRDgeometry.h"
 
-class AliTRDdataArrayI;
-
 ClassImp(AliEveTRDLoader)
 ClassImp(AliEveTRDLoaderEditor)
 
@@ -59,13 +56,7 @@ AliEveTRDLoader::AliEveTRDLoader(const Text_t* n, const Text_t* t) : TEveElement
 {
   // Constructor.
 
-  AliCDBManager *fCDBManager=AliCDBManager::Instance();
-  fCDBManager->SetDefaultStorage("local://$ALICE_ROOT");
-  fCDBManager->SetRun(0);
-
-  if(!AliEveEventManager::AssertGeometry()){
-    TGeoManager::Import("geometry.root");
-  }
+  AliEveEventManager::AssertGeometry();
 
   fGeo = new AliTRDgeometry();
   //fGeo->CreateClusterMatrixArray();
@@ -171,7 +162,7 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev)
     if(!t) return kFALSE;
     if(!LoadClusters(t)) return kFALSE;
   } else if(fDataType&kTRDTracklets){
-    t = (TTree*)gDirectory->Get("TreeT");
+    t = (TTree*)gDirectory->Get("tracklets");
     if(!t) return kFALSE;
     if(!LoadTracklets(t)) return kFALSE;
   } else AliWarning("Please select first the type of data that you want to monitor and then hit the \"Load\" button.");
@@ -226,7 +217,7 @@ Bool_t AliEveTRDLoader::LoadClusters(TTree *tC)
   // Load clusters.
 
   AliInfo("Loading ...");
-  if(!fChildren.size()) return kTRUE;
+  if(!fChildren.size()) return kFALSE;
 
   TObjArray *clusters = new TObjArray();
   tC->SetBranchAddress("TRDcluster", &clusters);
@@ -251,7 +242,7 @@ Bool_t AliEveTRDLoader::LoadDigits(TTree *tD)
 
   AliInfo("Loading ...");
 
-  if(!fChildren.size()) return kTRUE;
+  if(!fChildren.size()) return kFALSE;
 
   AliEveTRDChamber *chmb;
   AliTRDdigitsManager dm;
@@ -268,22 +259,19 @@ Bool_t AliEveTRDLoader::LoadDigits(TTree *tD)
 
 
 //______________________________________________________________________________
-Bool_t AliEveTRDLoader::LoadTracklets(TTree *tT)
+Bool_t AliEveTRDLoader::LoadTracklets(TTree *trklTree)
 {
   // Load tracklets.
 
   AliInfo("Loading ...");
-  if(!fChildren.size()) return kTRUE;
+  if(!fChildren.size()) return kFALSE;
 
-  TObjArray *tracks = new TObjArray();
-  tT->SetBranchAddress("TRDmcmTracklet",&tracks);
 
   AliEveTRDChamber *chmb = 0x0;
-  AliTRDmcmTracklet *trk=0x0;
+
   for(int idet=0; idet<540; idet++){
-    if(!tT->GetEntry(idet)) continue;
-    if(tracks->GetEntriesFast()) trk = (AliTRDmcmTracklet*)tracks->UncheckedAt(0);
-    if((chmb = GetChamber(trk->GetDetector()))) chmb->LoadTracklets(tracks);
+    if((chmb = GetChamber(idet)))
+      chmb->LoadTracklets(trklTree);
   }
 
   return kTRUE;
@@ -311,25 +299,25 @@ Bool_t AliEveTRDLoader::Open(const char *filename, const char *dir)
   }
 
   if(((TObjString*)(*so)[1])->GetString().CompareTo("Hits") == 0){
-    if(count && !fDataType&kTRDHits){ 
+    if(count && !(fDataType&kTRDHits)){ 
       AliWarning("Data type set to HITS according to file name. Previous settings will be overwritten.");
       fDataType = 0; 
     }
     fDataType|=kTRDHits;
   } else   if(((TObjString*)(*so)[1])->GetString().CompareTo("Digits") == 0){
-    if(count && !fDataType&kTRDDigits){ 
+    if(count && !(fDataType&kTRDDigits)){ 
       AliWarning("Data type set to DIGITS according to file name. Previous settings will be overwritten.");
       fDataType = 0; 
     }
     fDataType|=kTRDDigits;
   } else if(((TObjString*)(*so)[1])->GetString().CompareTo("RecPoints") == 0){
-    if(count && !fDataType&kTRDClusters){ 
+    if(count && !(fDataType&kTRDClusters)){ 
       AliWarning("Data type set to CLUSTERS according to file name. Previous settings will be overwritten.");
       fDataType = 0; 
     }
     fDataType|=kTRDClusters;  
-  } else if(((TObjString*)(*so)[1])->GetString().CompareTo("Tracks") == 0){
-    if(count && !fDataType&kTRDTracklets){ 
+  } else if(((TObjString*)(*so)[1])->GetString().CompareTo("Tracklets") == 0){
+    if(count && !(fDataType&kTRDTracklets)){ 
       AliWarning("Data type set to TRACKLETS according to file name. Previous settings will be overwritten.");
       fDataType = 0; 
     }
@@ -348,9 +336,10 @@ void AliEveTRDLoader::Paint(Option_t *option)
 {
   // Paint object.
 
+  AliEveTRDModule *module(NULL);
   List_i ichmb = fChildren.begin();
   while(ichmb != fChildren.end()){
-    (dynamic_cast<AliEveTRDModule*>(*ichmb))->Paint(option);
+    if((module = dynamic_cast<AliEveTRDModule*>(*ichmb))) module->Paint(option);
     ichmb++;
   }
 }
@@ -363,7 +352,7 @@ void AliEveTRDLoader::Unload()
 
   List_i ichmb = fChildren.begin();
   while(ichmb != fChildren.end()){
-    (dynamic_cast<AliEveTRDModule*>(*ichmb))->Reset();
+    //(dynamic_cast<AliEveTRDModule*>(*ichmb))->Reset();
     ichmb++;
   }
 }
@@ -483,7 +472,7 @@ void AliEveTRDLoaderEditor::SetModel(TObject* obj)
 {
   // Set model object.
 
-  fM = dynamic_cast<AliEveTRDLoader*>(obj);
+  if(!(fM = dynamic_cast<AliEveTRDLoader*>(obj))) return;
 
   fFile->SetEnabled(!fM->IsDataLinked());
   fFile->SetText(gSystem->BaseName(fM->fFilename.Data()));