Added event id to frame

diff --git a/EVE/EveHLT/AliEveEventBuffer.cxx b/EVE/EveHLT/AliEveEventBuffer.cxx
index 53aabbc2b8164a235cea1bcc0df3656221095aec..f5e5d103208a5f4e7309df5ff6fe280d0e9f73ca 100644 (file)
--- a/EVE/EveHLT/AliEveEventBuffer.cxx
+++ b/EVE/EveHLT/AliEveEventBuffer.cxx
@@ -36,8 +36,11 @@ AliEveEventBuffer::AliEveEventBuffer() :
   fTimer = new TTimer();
   fTimer->Connect("Timeout()", "AliEveEventBuffer", this, "CreateBufferThread()");
 
-  fEventId = new Int_t[fBufferSize];
-
+  fEventId = new ULong64_t[fBufferSize];
+  for(Int_t id = 0; id < fBufferSize; id++ ) {
+    fEventId[id] = -2;
+  }
+  
 
 }
 
@@ -134,6 +137,8 @@ TObject * AliEveEventBuffer::Back() {
   }
 }
 
+
+
 ///______________________________________________________________________________
 TObject * AliEveEventBuffer::Fwd() {
   PrintIndeces();
@@ -184,7 +189,12 @@ void AliEveEventBuffer::PrintBuffer() {
 void AliEveEventBuffer::FetchEvent() {
   cout << "FetchEvent " << endl;
   TObject * event = GetEventFromSource();
-  if(event) AddToBuffer(event);
+  ULong64_t eventId = GetEventIdFromSource();
+  if(event) {
+    AddToBuffer(event);
+    fEventId[fBIndex[kTop]] = eventId;  
+  }
+  
   PrintIndeces();
   cout << "FetchedEvent " << endl;
   
@@ -201,9 +211,8 @@ void AliEveEventBuffer::AddToBuffer(TObject * event) {
   fEventBuffer->RemoveAt(fBIndex[kTop]);
   //if (object) delete object;
   fEventBuffer->AddAt(event, fBIndex[kTop]);
-}
-
 
+}
 
 ///_____________________________________________________________________________________
 Int_t AliEveEventBuffer::CalculateNext(Int_t current) {

diff --git a/EVE/EveHLT/AliEveEventBuffer.h b/EVE/EveHLT/AliEveEventBuffer.h
index b88bbf5be1c299e2efeefecdfdf54a2b7bd54b76..0a201fe59f8946a4eaa0ed7eb529f42d7334f045 100644 (file)
--- a/EVE/EveHLT/AliEveEventBuffer.h
+++ b/EVE/EveHLT/AliEveEventBuffer.h
@@ -57,10 +57,9 @@ public:
     ;
   }
 
-  Int_t GetEventId() const { return fEventId[fBIndex[kCurrent]];}
-
   void CreateBufferThread();
 
+  ULong64_t GetEventId() const { return fEventId[fBIndex[kCurrent]]; }
 
 protected:
   
@@ -88,8 +87,10 @@ protected:
   
   //Add event to buffer
   virtual void AddToBuffer(TObject * event);
-  
+  //  virtual void AddToBuffer(TObject * event, ULong64_t eventId);
   virtual TObject * GetEventFromSource() = 0;
+  virtual ULong64_t GetEventIdFromSource() { return 0;}
+
 
   void FetchEvent();
   
@@ -99,7 +100,7 @@ protected:
   Int_t CalculatePrevious(Int_t current);
   Int_t CalculateNext(Int_t current);
 
-  void SetEventId(Int_t eventId) { fEventId[fBIndex[kCurrent]] = eventId;}
+  void SetEventId(ULong64_t eventId) { fEventId[fBIndex[kCurrent]] = eventId;}
   
   void SetBufferMonStarted(Bool_t started) {fBufferMonStarted = started;}
   Bool_t GetBufferMonStarted () const { return fBufferMonStarted;}
@@ -122,7 +123,7 @@ private:
   TTimer * fTimer;
 
   //Current event id
-  Int_t * fEventId;
+  ULong64_t * fEventId;
   
   Bool_t fBufferMonStarted;
 

diff --git a/EVE/EveHLT/AliEveEventBufferHomer.cxx b/EVE/EveHLT/AliEveEventBufferHomer.cxx
index 4ef4384a662d72f38ca676193ce4781111d2c345..16d7d3c4003da77cae737e8328b24f85b5b2a0ed 100644 (file)
--- a/EVE/EveHLT/AliEveEventBufferHomer.cxx
+++ b/EVE/EveHLT/AliEveEventBufferHomer.cxx
@@ -36,6 +36,10 @@ AliEveEventBufferHomer::~AliEveEventBufferHomer() {
 
 
 
+ULong64_t AliEveEventBufferHomer::GetEventIdFromSource() {
+  ///
+  return fHomer->GetEventID();
+}
 
 ///______________________________________________________________________
 TObject * AliEveEventBufferHomer::GetEventFromSource() {
@@ -43,6 +47,7 @@ TObject * AliEveEventBufferHomer::GetEventFromSource() {
   if(fHomer) {
     cout << "calling nexthomerevent"<<endl;
     TList * blockList = fHomer->NextHOMEREvent();
+    
     if(blockList)  return dynamic_cast<TObject*>(blockList);
     else return NULL;
   } 
@@ -50,6 +55,7 @@ TObject * AliEveEventBufferHomer::GetEventFromSource() {
   cout << "AliEveEventBufferHomer::GetEventFromSource() : fHomer is null pointer!!"<<endl;
   return NULL;
 }
+
 ///___________________________________________________________________________
 void AliEveEventBufferHomer::AddToBuffer(TObject * event) {
   cout << "Add to buffer"<<endl;
@@ -62,6 +68,19 @@ void AliEveEventBufferHomer::AddToBuffer(TObject * event) {
   }
 }
 
+// ///___________________________________________________________________________
+// void AliEveEventBufferHomer::AddToBuffer(TObject * event, ULong64_t eventId ) {
+//   cout << "Add to buffer"<<endl;
+//   if(!event) return;
+//   fBIndex[kTop] = CalculateNext(fBIndex[kTop]);
+//   TList * list = dynamic_cast<TList*>(fEventBuffer->At(fBIndex[kTop]));
+//   if(list) {
+//     list->Clear();
+//     list->AddAll(dynamic_cast<TList*>(event));
+//     fEventId[fBIndex[kTop]] = eventId;  
+//   }
+// }
+
 
 ///______________________________________________________________________
 void AliEveEventBufferHomer::Initialize() {

diff --git a/EVE/EveHLT/AliEveEventBufferHomer.h b/EVE/EveHLT/AliEveEventBufferHomer.h
index 285483e6ffc02449843f8b6e641cec899b8037de..3812aad391e1942b689c8f13d77b118a55e09d5d 100644 (file)
--- a/EVE/EveHLT/AliEveEventBufferHomer.h
+++ b/EVE/EveHLT/AliEveEventBufferHomer.h
@@ -60,10 +60,13 @@ private:
 
   ///Inherited from AliEveEventBuffer
   TObject * GetEventFromSource();
+  
+  ULong64_t GetEventIdFromSource();
+
 
   ///Inherited form AliEveEventBuffer
   void AddToBuffer(TObject * event);
-
+  //void AddToBuffer(TObject * event, ULong64_t eventId);
   AliEveHOMERManager * fHomer;
   Int_t fEventNo;
   TList * fAsyncList;

diff --git a/EVE/EveHLT/AliEveHLTEventManager.cxx b/EVE/EveHLT/AliEveHLTEventManager.cxx
index 8c4641327086c9972b28fb7293326d7e9201198f..c96db3a7f6d07dfee84e8e43145c631a19bdbafa 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManager.cxx
+++ b/EVE/EveHLT/AliEveHLTEventManager.cxx
@@ -146,6 +146,13 @@ Int_t AliEveHLTEventManager::ProcessEvent(AliESDEvent * event) {
 
   gEve->DisableRedraw();
 
+  // -- Set EventID in Window Title  
+  TString winTitle("Eve Main Window");
+  winTitle += Form("-- Run Number: %d", fRunNumber); 
+  winTitle += Form("-- Event ID : 0x%lu ", GetEventBuffer()->GetEventId() );
+  GetEveManager()->GetBrowser()->SetWindowName(winTitle);
+
+
   
   cout << "reset()"<<endl;
   
@@ -187,9 +194,9 @@ Int_t AliEveHLTEventManager::ProcessEvent(TList * blockList) {
     return -1;
   }
  
-  cout << "reset ()"<<endl;
+  cout << "ProcessEvent()::reset ()"<<endl;
   ResetDisplay();
-  cout << "done reset()"<<endl;
+  cout << "ProcessEvent() :: done reset()"<<endl;
   AliHLTHOMERBlockDesc * block = NULL;
   TIter next(blockList);
   while ((block = (AliHLTHOMERBlockDesc*)next())) {
@@ -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
   //==============================================================================

diff --git a/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx b/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
index 1a32ace966be877f44306455d40a709a02249f7d..e71a8d6978b9f8b4651e7d55a364271d4de43c25 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
+++ b/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
@@ -38,7 +38,7 @@ TGedFrame(p, width, height, options | kVerticalFrame, back),
   fButtonNavigateBack(0),
   fButtonNavigateFwd(0),
   fButtonPrintScreens(NULL),
-  fBoxTriggerSelector(0),
+//fBoxTriggerSelector(0),
 //  fBoxEventLoopSpeed(0),
   fButtonEventLoopText(0),
   fButtonUpdateEvents(NULL),
@@ -46,27 +46,17 @@ TGedFrame(p, width, height, options | kVerticalFrame, back),
  fEventLoopStarted(kFALSE) 
 {
 
+  MakeTitle("AliEveHLTEventManager");
+
   fButtonUpdateEvents = new TGTextButton(this, " Fill buffer.. ");
   AddFrame(fButtonUpdateEvents); //, new TGLayoutHints(...));
   fButtonUpdateEvents->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "PollEvents()");
 
-
-  MakeTitle("AliEveHLTEventManager");
-
   // Create widgets
   // fXYZZ = new TGSomeWidget(this, ...);
   // AddFrame(fXYZZ, new TGLayoutHints(...));
   // fXYZZ->Connect("SignalName()", "AliEveHLTEventManagerEditor", this, "DoXYZZ()");
 
-  fButtonConnect = new TGTextButton(this, " Reconnect ");
-  AddFrame(fButtonConnect); //, new TGLayoutHints(...));
-  fButtonConnect->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "ConnectToHLT()");
-
-  fButtonWriteToFile = new TGTextButton(this, " Write to file  ");
-  AddFrame(fButtonWriteToFile); //, new TGLayoutHints(...));
-  fButtonWriteToFile->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "WriteBlockListToFile()");
-
-
   fButtonNextEvent = new TGTextButton(this, "  NextEvent  ");
   AddFrame(fButtonNextEvent); //, new TGLayoutHints(...));
   fButtonNextEvent->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "NextEvent()");
@@ -83,17 +73,28 @@ TGedFrame(p, width, height, options | kVerticalFrame, back),
   fButtonPrintScreens = new TGTextButton(this, "  Save Viewers  ");
   AddFrame(fButtonPrintScreens); //, new TGLayoutHints(...));
   fButtonPrintScreens->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "PrintScreens()");
+  
+  fButtonWriteToFile = new TGTextButton(this, " Write to file  ");
+  AddFrame(fButtonWriteToFile); //, new TGLayoutHints(...));
+  fButtonWriteToFile->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "WriteBlockListToFile()");
+
+  fButtonConnect = new TGTextButton(this, " Reconnect ");
+  AddFrame(fButtonConnect); //, new TGLayoutHints(...));
+  fButtonConnect->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "ConnectToHLT()");
+
+ 
+ 
 
 
-  fBoxTriggerSelector = new TGComboBox(this, "Select Trigger");
-  fBoxTriggerSelector->AddEntry("HLT Global Trigger", 0);
-  fBoxTriggerSelector->AddEntry("Barrel multiplicity trigger", 1);
-  fBoxTriggerSelector->AddEntry("PHOS Geometry trigger", 2);
-  fBoxTriggerSelector->AddEntry("No trigger selection", 3);
-  fBoxTriggerSelector->Connect("Selected(Int_t)","AliEveHLTEventManagerEditor", this, "SetTriggerString(int)");
-  fBoxTriggerSelector->SetWidth(150);
-  fBoxTriggerSelector->SetHeight(25);
-  AddFrame(fBoxTriggerSelector);
+  // fBoxTriggerSelector = new TGComboBox(this, "Select Trigger");
+  // fBoxTriggerSelector->AddEntry("HLT Global Trigger", 0);
+  // fBoxTriggerSelector->AddEntry("Barrel multiplicity trigger", 1);
+  // fBoxTriggerSelector->AddEntry("PHOS Geometry trigger", 2);
+  // fBoxTriggerSelector->AddEntry("No trigger selection", 3);
+  // fBoxTriggerSelector->Connect("Selected(Int_t)","AliEveHLTEventManagerEditor", this, "SetTriggerString(int)");
+  // fBoxTriggerSelector->SetWidth(150);
+  // fBoxTriggerSelector->SetHeight(25);
+  // AddFrame(fBoxTriggerSelector);
 
   fButtonEventLoopText = new TGTextButton(this, "  Loop Events  ");
   AddFrame(fButtonEventLoopText); //, new TGLayoutHints(...));

diff --git a/EVE/EveHLT/AliEveHLTEventManagerEditor.h b/EVE/EveHLT/AliEveHLTEventManagerEditor.h
index f67ed2c5e46b2d002b145e8ed7e2b41d0b16ff9d..731978ee84b16101cb5bf9be3f10c1cb58b5319e 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManagerEditor.h
+++ b/EVE/EveHLT/AliEveHLTEventManagerEditor.h
@@ -51,7 +51,7 @@ protected:
   TGTextButton     *fButtonNavigateBack; // Button to navigate back
   TGTextButton     *fButtonNavigateFwd;  // Button to navigate fwd
   TGTextButton     *fButtonPrintScreens;  // Button to print viewers
-  TGComboBox       *fBoxTriggerSelector; // Drop down menu to select trigger criteria.
+  //TGComboBox       *fBoxTriggerSelector; // Drop down menu to select trigger criteria.
   TGTextButton     *fButtonEventLoopText; //Text button to start / stop event loop.
   TGTextButton    *fButtonUpdateEvents;
   //TGComboBox       *fBoxEventLoopSpeed; // Drop down menu to set the speed of the loop.