X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVE%2Fmacros%2Falieve_online.C;h=9709f2da547087b3b0b885a06feac4d79259a8d0;hb=115b665569aecc3c6e138662717af11dc50b640f;hp=d4fb3b0c54bde13f7dd6c1e75bd3b0514e82fb09;hpb=47aab29b1ff1a01a805fdade10d255c257bbe626;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVE/macros/alieve_online.C b/EVE/macros/alieve_online.C
index d4fb3b0c54b..9709f2da547 100644
--- a/EVE/macros/alieve_online.C
+++ b/EVE/macros/alieve_online.C
@@ -4,7 +4,7 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-TEveGeoShape *gGeomGentle    = 0;
+TEveGeoShape *gGeomGentle = 0;
 
 void alieve_online_init()
 {
@@ -12,15 +12,19 @@ void alieve_online_init()
 
   gROOT->LoadMacro("primary_vertex.C");
   gROOT->LoadMacro("esd_tracks.C");
+  gROOT->LoadMacro("trd_tracks.C++");
+  gROOT->LoadMacro("trd_detectors.C++");
 
   gROOT->LoadMacro("its_clusters.C++");
   gROOT->LoadMacro("tpc_clusters.C++");
-  gROOT->LoadMacro("trd_clusters.C++");
+  gROOT->LoadMacro("hmpid_clusters.C++");
 
   gROOT->LoadMacro("acorde_raw.C");
   gROOT->LoadMacro("its_raw.C");
   gROOT->LoadMacro("tpc_raw.C");
 
+  TEveUtil::AssertMacro("VizDB_scan.C");
+
   // Temp fix !!!
   TGeoManager *man = gGeoManager;
   gGeomGentle = geom_gentle();
@@ -28,50 +32,63 @@ void alieve_online_init()
   gGeoManager = man;
 
   gROOT->ProcessLine(".L SplitGLView.C++g"); // !!!! debug-mode
+
   TEveBrowser* browser = gEve->GetBrowser();
+  browser->ShowCloseTab(kFALSE);
+
   browser->ExecPlugin("SplitGLView", 0, "new SplitGLView(gClient->GetRoot(), 600, 450, kTRUE)");
 
   if (gRPhiMgr) {
     TEveProjectionAxes* a = new TEveProjectionAxes(gRPhiMgr);
-    a->SetNumTickMarks(3);
-    a->SetText("R-Phi");
-    a->SetFontFile("comicbd");
-    a->SetFontSize(10);
+    a->SetMainColor(kWhite);
+    a->SetTitle("R-Phi");
+    a->SetTitleSize(0.05);
+    a->SetTitleFont();
+    a->SetLabelSize(0.025);
+    a->SetLabelFont();
     gEve->GetScenes()->FindChild("R-Phi Projection")->AddElement(a);
   }
   if (gRhoZMgr) {
     TEveProjectionAxes* a = new TEveProjectionAxes(gRhoZMgr);
-    a->SetNumTickMarks(3);
-    a->SetText("Rho-Z");
-    a->SetFontFile("comicbd");
-    a->SetFontSize(10);
+    a->SetMainColor(kWhite);
+    a->SetTitle("Rho-Phi");
+    a->SetTitleSize(0.05);
+    a->SetTitleFont();
+    a->SetLabelSize(0.025);
+    a->SetLabelFont();
     gEve->GetScenes()->FindChild("Rho-Z Projection")->AddElement(a);
   }
 
-  TEveBrowser* browser = gEve->GetBrowser();
-
   browser->StartEmbedding(TRootBrowser::kBottom);
-  new AliEveEventManagerWindow;
+  new AliEveEventManagerWindow(AliEveEventManager::GetMaster());
   browser->StopEmbedding("EventCtrl");
 
+  browser->ShowCloseTab(kTRUE);
 
   gEve->Redraw3D(kTRUE);
 }
 
 void alieve_online_on_new_event()
 {
-
-  its_raw();
+  if (AliEveEventManager::HasRawReader())
+    its_raw();
   its_clusters();
 
-  tpc_raw();
+  if (AliEveEventManager::HasRawReader())
+    tpc_raw();
   tpc_clusters();
 
-  acorde_raw();
+  hmpid_clusters();
+
+  if (AliEveEventManager::HasRawReader())
+    acorde_raw();
 
   primary_vertex();
   esd_tracks();
 
+  if (AliEveEventManager::HasESDfriend()) trd_tracks();
+  trd_detectors();
+
   AliESDEvent* esd = AliEveEventManager::AssertESD();
   Double_t x[3];
   esd->GetPrimaryVertex()->GetXYZ(x);