added possibility to stop buffer monitor

diff --git a/EVE/EveHLT/AliEveEventBuffer.cxx b/EVE/EveHLT/AliEveEventBuffer.cxx
index edef8e20791c8044cd2833864a6cdf0350e25db4..e7817e414f4f0a698a79640cb45ef0bb0100f569 100644 (file)
--- a/EVE/EveHLT/AliEveEventBuffer.cxx
+++ b/EVE/EveHLT/AliEveEventBuffer.cxx
@@ -61,12 +61,12 @@ AliEveEventBuffer::~AliEveEventBuffer() {
   fCurrentEvent = NULL;
 
 }
-
+///___________________________________________________________________________
 void AliEveEventBuffer::CreateBufferThread() {
-  //  cout << "hereherehere"<<endl;
+  cout << "CreateBufferThread()"<<endl;
   TThread * fThread = new TThread(AliEveEventBuffer::BufferThread, (void*) this);
   fThread->Run();
-
+  cout << "Done BufferThread"<<endl;
 }
 
 ///___________________________________________________________________________
@@ -252,9 +252,15 @@ Int_t AliEveEventBuffer::CalculateDifference(Int_t top, Int_t low) {
 void AliEveEventBuffer::StartBufferMonitor() {
   //cout << "NOT !!! starting buffer mon"<<endl;
   cout << "starting buffer mon"<<endl;
-  CreateBufferThread();
-  SetBufferMonStarted(kTRUE);
-  fTimer->Start(3000);
+  if(!GetBufferMonStarted()) {
+    CreateBufferThread();
+    SetBufferMonStarted(kTRUE);
+    fTimer->Start(3000);
+  } else {
+    cout << "Stopping buffer monitor"<<endl;
+    fTimer->Stop();
+    SetBufferMonStarted(kFALSE);
+  }
 }
 ///___________________________________________________________________________________
 void AliEveEventBuffer::StopBufferMonitor() {

diff --git a/EVE/EveHLT/AliEveEventBuffer.h b/EVE/EveHLT/AliEveEventBuffer.h
index 0a201fe59f8946a4eaa0ed7eb529f42d7334f045..bf81f1656d34a80a89d331eef39e6ab6a92f204e 100644 (file)
--- a/EVE/EveHLT/AliEveEventBuffer.h
+++ b/EVE/EveHLT/AliEveEventBuffer.h
@@ -87,7 +87,6 @@ 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;}
 

diff --git a/EVE/EveHLT/AliEveEventBufferHomer.cxx b/EVE/EveHLT/AliEveEventBufferHomer.cxx
index 16d7d3c4003da77cae737e8328b24f85b5b2a0ed..8769a468a4505ee7850a19db8060cb244ab0d638 100644 (file)
--- a/EVE/EveHLT/AliEveEventBufferHomer.cxx
+++ b/EVE/EveHLT/AliEveEventBufferHomer.cxx
@@ -68,18 +68,6 @@ 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;  
-//   }
-// }
 
 
 ///______________________________________________________________________

diff --git a/EVE/EveHLT/AliEveEventBufferHomer.h b/EVE/EveHLT/AliEveEventBufferHomer.h
index 3812aad391e1942b689c8f13d77b118a55e09d5d..e31066fac9bc40fef7ce825b38db27e034fa78c0 100644 (file)
--- a/EVE/EveHLT/AliEveEventBufferHomer.h
+++ b/EVE/EveHLT/AliEveEventBufferHomer.h
@@ -66,7 +66,6 @@ private:
 
   ///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/AliEveHLTEventManagerEditor.cxx b/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
index e71a8d6978b9f8b4651e7d55a364271d4de43c25..599912306eecf560afee3747700c1b8fedbe1001 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
+++ b/EVE/EveHLT/AliEveHLTEventManagerEditor.cxx
@@ -48,7 +48,7 @@ TGedFrame(p, width, height, options | kVerticalFrame, back),
 
   MakeTitle("AliEveHLTEventManager");
 
-  fButtonUpdateEvents = new TGTextButton(this, " Fill buffer.. ");
+  fButtonUpdateEvents = new TGTextButton(this, "- Fill buffer - ");
   AddFrame(fButtonUpdateEvents); //, new TGLayoutHints(...));
   fButtonUpdateEvents->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "PollEvents()");
 
@@ -57,28 +57,28 @@ TGedFrame(p, width, height, options | kVerticalFrame, back),
   // AddFrame(fXYZZ, new TGLayoutHints(...));
   // fXYZZ->Connect("SignalName()", "AliEveHLTEventManagerEditor", this, "DoXYZZ()");
 
-  fButtonNextEvent = new TGTextButton(this, "  NextEvent  ");
+  fButtonNextEvent = new TGTextButton(this, "-   NextEvent  -");
   AddFrame(fButtonNextEvent); //, new TGLayoutHints(...));
   fButtonNextEvent->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "NextEvent()");
 
-  fButtonNavigateBack = new TGTextButton(this, "  Navigate Back  ");
+  fButtonNavigateBack = new TGTextButton(this, "-  Navigate Back - ");
   AddFrame(fButtonNavigateBack); //, new TGLayoutHints(...));
   fButtonNavigateBack->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "NavigateBack()");
 
-  fButtonNavigateFwd = new TGTextButton(this, "  Navigate Fwd  ");
+  fButtonNavigateFwd = new TGTextButton(this, "-  Navigate Fwd  -");
   AddFrame(fButtonNavigateFwd); //, new TGLayoutHints(...));
   fButtonNavigateFwd->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "NavigateFwd()");
 
 
-  fButtonPrintScreens = new TGTextButton(this, "  Save Viewers  ");
+  fButtonPrintScreens = new TGTextButton(this, "-  Save Viewers - ");
   AddFrame(fButtonPrintScreens); //, new TGLayoutHints(...));
   fButtonPrintScreens->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "PrintScreens()");
   
-  fButtonWriteToFile = new TGTextButton(this, " Write to file  ");
+  fButtonWriteToFile = new TGTextButton(this, "-  Write to file  -");
   AddFrame(fButtonWriteToFile); //, new TGLayoutHints(...));
   fButtonWriteToFile->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "WriteBlockListToFile()");
 
-  fButtonConnect = new TGTextButton(this, " Reconnect ");
+  fButtonConnect = new TGTextButton(this, "-     Reconnect   - ");
   AddFrame(fButtonConnect); //, new TGLayoutHints(...));
   fButtonConnect->Connect("Clicked()", "AliEveHLTEventManagerEditor", this, "ConnectToHLT()");
 
@@ -151,6 +151,7 @@ void AliEveHLTEventManagerEditor::PollEvents() {
   fM->StartBufferMonitor();
 }
 
+
 void AliEveHLTEventManagerEditor::EventLoop() {
   // Start/stop event loop
   if ( !fEventLoopStarted ) {