From 8b515ee478cf79fbf37d917961a676ced2a9e443 Mon Sep 17 00:00:00 2001 From: slindal Date: Thu, 4 Nov 2010 20:47:03 +0000 Subject: [PATCH] added possibility to stop buffer monitor --- EVE/EveHLT/AliEveEventBuffer.cxx | 18 ++++++++++++------ EVE/EveHLT/AliEveEventBuffer.h | 1 - EVE/EveHLT/AliEveEventBufferHomer.cxx | 12 ------------ EVE/EveHLT/AliEveEventBufferHomer.h | 1 - EVE/EveHLT/AliEveHLTEventManagerEditor.cxx | 15 ++++++++------- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/EVE/EveHLT/AliEveEventBuffer.cxx b/EVE/EveHLT/AliEveEventBuffer.cxx index edef8e20791..e7817e414f4 100644 --- a/EVE/EveHLT/AliEveEventBuffer.cxx +++ b/EVE/EveHLT/AliEveEventBuffer.cxx @@ -61,12 +61,12 @@ AliEveEventBuffer::~AliEveEventBuffer() { fCurrentEvent = NULL; } - +///___________________________________________________________________________ void AliEveEventBuffer::CreateBufferThread() { - // cout << "hereherehere"<Run(); - + cout << "Done BufferThread"<Start(3000); + if(!GetBufferMonStarted()) { + CreateBufferThread(); + SetBufferMonStarted(kTRUE); + fTimer->Start(3000); + } else { + cout << "Stopping buffer monitor"<Stop(); + SetBufferMonStarted(kFALSE); + } } ///___________________________________________________________________________________ void AliEveEventBuffer::StopBufferMonitor() { diff --git a/EVE/EveHLT/AliEveEventBuffer.h b/EVE/EveHLT/AliEveEventBuffer.h index 0a201fe59f8..bf81f1656d3 100644 --- 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 16d7d3c4003..8769a468a45 100644 --- 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"<(fEventBuffer->At(fBIndex[kTop])); -// if(list) { -// list->Clear(); -// list->AddAll(dynamic_cast(event)); -// fEventId[fBIndex[kTop]] = eventId; -// } -// } ///______________________________________________________________________ diff --git a/EVE/EveHLT/AliEveEventBufferHomer.h b/EVE/EveHLT/AliEveEventBufferHomer.h index 3812aad391e..e31066fac9b 100644 --- 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 e71a8d6978b..599912306ee 100644 --- 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 ) { -- 2.43.0