minor fixes

[u/mrichter/AliRoot.git] / EVE / alice-macros / tof_raw.C

diff --git a/EVE/alice-macros/tof_raw.C b/EVE/alice-macros/tof_raw.C
index fe9e93211a21deef830394a6c5a6b2b2a703037f..63c9f15cb10b4f6d2a1bbd3b22b7ba917b24f0ef 100644 (file)
--- a/EVE/alice-macros/tof_raw.C
+++ b/EVE/alice-macros/tof_raw.C
@@ -1,50 +1,16 @@
-void tof_raw(const char *input = "raw.root",
-            const char *geometry = "geometry.root",
-            Int_t  event = 0,
-            Bool_t newDecoder = kFALSE)
+void tof_raw(Int_t newDecoder = 2)
 {
+  AliRawReader *rawReader = AliEveEventManager::AssertRawReader();
 
   TClonesArray *array = 0x0;
 
-  if (gSystem->AccessPathName(input, kReadPermission))
-  {
-    Error("tof_raw", "file '%s' not found.", input);
-    return;
-  }
-
-  TGeoManager *localGeoManager = (TGeoManager*)gEve->GetGeometry(geometry);
+  TGeoManager *localGeoManager = gEve->GetDefaultGeometry();
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }
 
-  AliRawReader *rawReader = NULL;
-  TString fileName(input);
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName);
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName);
-    rawReader->SelectEvents(7);
-  }
-
   AliEveTOFDigitsInfo* di = new AliEveTOFDigitsInfo();
-
-  for (Int_t ev=0; rawReader->NextEvent(); ev++) {
-    if (ev==event) {
-
-      if (di) {
-       di->Delete();
-       di = new AliEveTOFDigitsInfo();
-      }
-
-      di->ReadRaw(rawReader, ev, newDecoder);
-      continue;
-    }
-
-    else continue;
-
-  }
+  di->ReadRaw(rawReader, newDecoder);
 
   AliTOFGeometry* g = new AliTOFGeometry();
  
@@ -53,7 +19,7 @@ void tof_raw(const char *input = "raw.root",
 
   TEveElementList* ll = new TEveElementList("TOF");
   ll->SetTitle("TOF detector");
-  ll->SetMainColor((Color_t)2);
+  ll->SetMainColor(2);
   gEve->AddElement(ll);
 
   for(Int_t iSector=0; iSector<g->NSectors(); iSector++) {
@@ -66,6 +32,8 @@ void tof_raw(const char *input = "raw.root",
 
   }
 
-  gEve->EnableRedraw();
+  delete di;
+  delete g;
 
+  gEve->EnableRedraw();
 }