From: abercuci <abercuci@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 4 Jan 2012 13:16:50 +0000 (+0000)
Subject: fix coverity
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=a2125de9f6d4a41f1a44c1ea4f06f192fdbbd9ad

fix coverity
---

diff --git a/EVE/EveDet/AliEveTRDData.cxx b/EVE/EveDet/AliEveTRDData.cxx
index 519a884e7b4..523019baee5 100644
--- a/EVE/EveDet/AliEveTRDData.cxx
+++ b/EVE/EveDet/AliEveTRDData.cxx
@@ -254,48 +254,47 @@ void AliEveTRDClusters::Load(const Char_t *w) const
   Int_t det = c->GetDetector();
   AliEveTRDLoader *loader(NULL);
   switch(typ){
-  case 4:
-    loader = new AliEveTRDLoaderSim("MC");
-    if(loader){
-      if(!loader->Open("galice.root")){delete loader; loader=NULL;}
-      else{
-        loader->SetDataType(AliEveTRDLoader::kTRDHits | AliEveTRDLoader::kTRDDigits | AliEveTRDLoader::kTRDClusters);
-        break;
-      }
-    }
-  case 0:  
+  case 0:
     loader = new AliEveTRDLoader("Hits");
-    if(loader){
-      if(!loader->Open("TRD.Hits.root")){delete loader; loader=NULL;}
-      else{
-        if(typ!=4) break;
-      }
+    if(!loader->Open("TRD.Hits.root")){
+      delete loader;
+      return;
     }
+    break;
   case 1:
-    if(!loader) loader = new AliEveTRDLoader("Digits");
-    if(loader){
-      if(!loader->Open("TRD.Digits.root")){
-        if(typ==1){delete loader; loader=NULL;}
-      } else {
-        if(typ!=4) break;
-      }
+    loader = new AliEveTRDLoader("Digits");
+    if(!loader->Open("TRD.Digits.root")){
+      delete loader;
+      return;
     }
+    break;
   case 2:
-    if(!loader) loader = new AliEveTRDLoader("Clusters");
-    if(loader){
-      if(!loader->Open("TRD.RecPoints.root")){
-        if(typ ==2){delete loader; loader=NULL;}
-      } else {
-        if(typ!=4) break;
-      }
+    loader = new AliEveTRDLoader("Clusters");
+    if(!loader->Open("TRD.RecPoints.root")){
+      delete loader;
+      return;
     }
+    break;
   case 3:
-    if(!loader) loader = new AliEveTRDLoader("Tracklets");
-    if(loader){
-      if(!loader->Open("TRD.Tracklets.root")){
-        if(typ ==3) {delete loader; loader=NULL;}
-      } else break;
+    loader = new AliEveTRDLoader("Tracklets");
+    if(!loader->Open("TRD.Tracklets.root")){
+      delete loader;
+      return;
     }
+    break;
+  case 4:
+    loader = new AliEveTRDLoaderSim("MC"); // Assume MC data. Try to load via run loader
+    if(!loader->Open("galice.root")){
+      delete loader; loader=NULL;
+      // Assume measured data. Try to load data types individualy
+      Int_t failed(0);
+      loader = new AliEveTRDLoader("Data");
+      if(!loader->Open("TRD.Digits.root")) failed++;
+      if(!loader->Open("TRD.RecPoints.root")) failed++;
+      if(!loader->Open("TRD.Tracklets.root")) failed++;
+      if(failed==3){delete loader;loader=NULL;}
+    }else loader->SetDataType(AliEveTRDLoader::kTRDHits | AliEveTRDLoader::kTRDDigits | AliEveTRDLoader::kTRDClusters);
+    break;
   default: return;
   }
   if(!loader) return;
diff --git a/EVE/EveDet/AliEveTRDLoader.cxx b/EVE/EveDet/AliEveTRDLoader.cxx
index 43ddb11788d..b022787e5e2 100644
--- a/EVE/EveDet/AliEveTRDLoader.cxx
+++ b/EVE/EveDet/AliEveTRDLoader.cxx
@@ -142,7 +142,7 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev)
   Unload();
 
   Int_t ndt(0);
-  const Char_t *tn[] = {"TreeH", "TreeD", "TreeR", "tracklets"};
+  const Char_t *tn[] = {"TreeH", "TreeD", "TreeR", "tracklets-raw"};
   const Char_t *fn[] = {"Hits", "Digits", "RecPoints", "Tracklets"};
   TTree *t(NULL); TFile *f(NULL);
   for(Int_t idt(0); idt<4; idt++){
diff --git a/EVE/EveDet/AliEveTRDLoaderImp.cxx b/EVE/EveDet/AliEveTRDLoaderImp.cxx
index 42df6a09290..dfdf5711686 100644
--- a/EVE/EveDet/AliEveTRDLoaderImp.cxx
+++ b/EVE/EveDet/AliEveTRDLoaderImp.cxx
@@ -114,7 +114,7 @@ Bool_t	AliEveTRDLoaderSim::Open(const char *filename, const char *dir)
   if(!fRunLoader) return kFALSE;
 
   gAlice = fRunLoader->GetAliRun();
-  if(!gAlice) fRunLoader->LoadgAlice();
+  if(!gAlice && fRunLoader->LoadgAlice()) return kFALSE;
   if(!gAlice) return kFALSE;
  
   fFilename = filename;