From 47aab29b1ff1a01a805fdade10d255c257bbe626 Mon Sep 17 00:00:00 2001 From: cvetan Date: Thu, 21 Aug 2008 13:52:41 +0000 Subject: [PATCH] Correct auto-load, external control and everything (Cvetan and Matevz) --- EVE/EveBase/AliEveEventManager.cxx | 4 +++- EVE/macros/alieve_online.C | 7 +++++++ STEER/AliReconstruction.cxx | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/EVE/EveBase/AliEveEventManager.cxx b/EVE/EveBase/AliEveEventManager.cxx index fb04133b227..34af423e510 100644 --- a/EVE/EveBase/AliEveEventManager.cxx +++ b/EVE/EveBase/AliEveEventManager.cxx @@ -384,6 +384,8 @@ void AliEveEventManager::SetEvent(AliRunLoader *runLoader, AliRawReader *rawRead ElementChanged(); AfterNewEventLoaded(); + + if (fAutoLoad) StartAutoLoadTimer(); } Int_t AliEveEventManager::GetMaxEventId(Bool_t /*refreshESD*/) const @@ -856,7 +858,7 @@ void AliEveEventManager::AutoLoadNextEvent() StopAutoLoadTimer(); NextEvent(); - if (fAutoLoad) + if (fAutoLoad && !fExternalCtrl) StartAutoLoadTimer(); } diff --git a/EVE/macros/alieve_online.C b/EVE/macros/alieve_online.C index de4e6999426..d4fb3b0c54b 100644 --- a/EVE/macros/alieve_online.C +++ b/EVE/macros/alieve_online.C @@ -48,6 +48,13 @@ void alieve_online_init() gEve->GetScenes()->FindChild("Rho-Z Projection")->AddElement(a); } + TEveBrowser* browser = gEve->GetBrowser(); + + browser->StartEmbedding(TRootBrowser::kBottom); + new AliEveEventManagerWindow; + browser->StopEmbedding("EventCtrl"); + + gEve->Redraw3D(kTRUE); } diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx index d1862eb32e4..7b8d579e8cd 100644 --- a/STEER/AliReconstruction.cxx +++ b/STEER/AliReconstruction.cxx @@ -2820,7 +2820,7 @@ Bool_t AliReconstruction::InitAliEVE() AliInfo(Form("Loading AliEVE macro: %s",macroStr.Data())); if (gROOT->LoadMacro(macroStr.Data()) != 0) return kFALSE; - gROOT->ProcessLine("if (!gAliEveEvent) {gAliEveEvent = new AliEveEventManager();gAliEveEvent->SetAutoLoad(kTRUE);gAliEveEvent->AddNewEventCommand(\"alieve_online_on_new_event()\");gEve->AddEvent(gAliEveEvent);};"); + gROOT->ProcessLine("if (!gAliEveEvent) {gAliEveEvent = new AliEveEventManager();gAliEveEvent->AddNewEventCommand(\"alieve_online_on_new_event()\");gEve->AddEvent(gAliEveEvent);};"); gROOT->ProcessLine("alieve_online_init()"); return kTRUE; @@ -2836,7 +2836,6 @@ void AliReconstruction::RunAliEVE() AliInfo("Running AliEVE..."); gROOT->ProcessLine(Form("gAliEveEvent->SetEvent((AliRunLoader*)%p,(AliRawReader*)%p,(AliESDEvent*)%p);",fRunLoader,fRawReader,fesd)); - gROOT->ProcessLine("gAliEveEvent->StartStopAutoLoadTimer();"); gSystem->Run(); } -- 2.43.0