bugfix: display reset before all block, not esd even block

[u/mrichter/AliRoot.git] / EVE / EveHLT / AliEveHLTEventManager.cxx

diff --git a/EVE/EveHLT/AliEveHLTEventManager.cxx b/EVE/EveHLT/AliEveHLTEventManager.cxx
index 8c4641327086c9972b28fb7293326d7e9201198f..522f37526605b771ee667897986149f6c54b091d 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManager.cxx
+++ b/EVE/EveHLT/AliEveHLTEventManager.cxx
@@ -6,7 +6,6 @@
 #include "TEveViewer.h"
 #include "TEveEventManager.h"
 
-//#include "AliHLTTriggerDecision.h"
 #include "AliHLTEvePhos.h"
 #include "AliHLTEveEmcal.h"
 #include "AliHLTEveTPC.h"
@@ -56,7 +55,8 @@ AliEveHLTEventManager::AliEveHLTEventManager() :
   fCenterProjectionsAtPrimaryVertex(kFALSE),
   fShowBarrel(kTRUE),
   fShowMuon(kFALSE), 
-  fRunNumber(-1)  
+  fRunNumber(-1),
+  fEventId(-1)
 {
   // see header file for class documentation
   // or
@@ -146,11 +146,18 @@ Int_t AliEveHLTEventManager::ProcessEvent(AliESDEvent * event) {
 
   gEve->DisableRedraw();
 
+  // -- Set EventID in Window Title  
+  TString winTitle("Eve Main Window");
+  SetRunNumber(event->GetRunNumber());
+  SetEventId(GetEventBuffer()->GetEventId());
+  winTitle += Form("-- Run Number: %d", GetRunNumber()); 
+  winTitle += Form("-- Event ID : 0x%016lX ", GetEventId() );
+  GetEveManager()->GetBrowser()->SetWindowName(winTitle);
+
+
   
   cout << "reset()"<<endl;
   
-  ResetDisplay();
-  
   cout << "process()"<<endl;
   if(!fHLTElement) {
     fHLTElement = new AliHLTEveHLT();
@@ -164,9 +171,6 @@ Int_t AliEveHLTEventManager::ProcessEvent(AliESDEvent * event) {
   
   if(!fEmcalElement) CreateEmcalElement();
   fEmcalElement->ProcessEvent(event);
-  
-  cout << "update()"<<endl;
-  UpdateDisplay();
 
   gEve->Redraw3D(0, 1);
   gEve->EnableRedraw();
@@ -187,19 +191,22 @@ Int_t AliEveHLTEventManager::ProcessEvent(TList * blockList) {
     return -1;
   }
  
-  cout << "reset ()"<<endl;
+    
   ResetDisplay();
-  cout << "done reset()"<<endl;
+  
+
   AliHLTHOMERBlockDesc * block = NULL;
   TIter next(blockList);
   while ((block = (AliHLTHOMERBlockDesc*)next())) {
     cout <<"Process Block"<<endl;
     ProcessBlock(block);
   } 
-
-  cout << "update() "<<endl;
-  UpdateDisplay();
   
+  
+  cout << "update()"<<endl;
+  UpdateDisplay();
+
+
   return 0;
 
 }
@@ -341,9 +348,9 @@ void AliEveHLTEventManager::ResetDisplay () {
 void AliEveHLTEventManager::PrintScreens() {
 //   //See header file for documentation
 
-//   fEveManager->GetDefaultGLViewer()->SavePicture(Form("%d_0x%lu_3D.gif", fRunNumber, GetEventID(fCurrentEventIdx)));
-//   fRhoZViewer->GetGLViewer()->SavePicture(Form("%d_0x%lu_RhoZ.gif", fRunNumber, GetEventID(fCurrentEventIdx)));
-//   fRPhiViewer->GetGLViewer()->SavePicture(Form("%d_0x%lu_RPhi.gif", fRunNumber, GetEventID(fCurrentEventIdx)));
+  fEveManager->GetDefaultGLViewer()->SavePicture(Form("%d_0x%016lX_3D.gif", fRunNumber, GetEventId()));
+  fRhoZViewer->GetGLViewer()->SavePicture(Form("%d_0x%016lX_RhoZ.gif", fRunNumber, GetEventId()));
+  fRPhiViewer->GetGLViewer()->SavePicture(Form("%d_0x%016lX_RPhi.gif", fRunNumber, GetEventId()));
   return;
 }
 
@@ -412,12 +419,6 @@ void  AliEveHLTEventManager::UpdateDisplay() {
   if(fMuonElement) fMuonElement->UpdateElements();
 
 
-  // -- Set EventID in Window Title  
-  TString winTitle("Eve Main Window");
-  winTitle += Form("-- Run Number: %d", fRunNumber); 
-  //winTitle += Form("-- Event ID : 0x%lu ", GetEventID(fCurrentEventIdx) );
-  GetEveManager()->GetBrowser()->SetWindowName(winTitle);
-
   //==============================================================================
   // -- Import global scene into projection scenes
   //==============================================================================
@@ -449,7 +450,9 @@ void  AliEveHLTEventManager::UpdateDisplay() {
 
 void AliEveHLTEventManager::SaveEveryThing() {
 
-  GetEventBuffer()->WriteToFile();
+  PrintScreens();
+
+  GetEventBuffer()->WriteToFile(GetRunNumber());
   //Save everything to file
   //fEventBuffer->SaveBlockList();
   //fEventBuffer->SaveAsyncBlockList();