Bugfixes enabling buffer navigation

diff --git a/EVE/EveHLT/AliEveHOMERManager.cxx b/EVE/EveHLT/AliEveHOMERManager.cxx
index 68d0522c1788b3eeb99d6d42cf6ad2ae53bdbba8..f355e34c7f05f7cce8904f677d3822b7894f08f0 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManager.cxx
+++ b/EVE/EveHLT/AliEveHOMERManager.cxx
@@ -313,8 +313,6 @@ Int_t AliEveHOMERManager::NextHOMEREvent() {
   Int_t iResult = 0;
 
   
-  //Loop over blocks
-  AliHLTHOMERBlockDesc * block = NULL;
  
   if ( NextEvent() ) {
     
@@ -322,11 +320,22 @@ Int_t AliEveHOMERManager::NextHOMEREvent() {
     iResult = ReConnectHOMER();
     return NextHOMEREvent();
   }
-  
  
+  return ProcessEvent();
+ 
+}
+
+
+//______________________________________________________________________________________________
+Int_t AliEveHOMERManager::ProcessEvent() {
+
   //We have a new event, reset display items (need to check if there really is anything interesting in event before resetting. ie not just histos)
   ResetDisplay();
-  
+ 
+
+  AliHLTHOMERBlockDesc * block = NULL;
+
+
   //Process the SYNCED block list
   if ( GetBlockList() == NULL) {
     printf ("onlineDisplay:   No regular BlockList ... \n");
@@ -343,7 +352,6 @@ Int_t AliEveHOMERManager::NextHOMEREvent() {
    
     
     TIter next(GetBlockList());
-   
     while ((block = (AliHLTHOMERBlockDesc*)next())) {
       ProcessBlock(block);
      

diff --git a/EVE/EveHLT/AliEveHOMERManager.h b/EVE/EveHLT/AliEveHOMERManager.h
index 5612fd0696a39d89e996a5543ef4e6e5c9931d38..5a0660866851705a73eafef38aec932194569188 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManager.h
+++ b/EVE/EveHLT/AliEveHOMERManager.h
@@ -75,9 +75,12 @@ public:
   /** Set the retry count for source list loop */
   void SetRetryCount(Int_t count, Int_t sleeptime) { fRetryCount = count; fRetrySleeptime = sleeptime; }
   
-  /** Get next event and process it */
+  /** Get next event from the readers */
   Int_t NextHOMEREvent();
 
+  /** Process the event data */
+  Int_t ProcessEvent();
+
   /** Set flag for event loop */
   void SetEventLoopStarted (Bool_t started) {fEventLoopStarted = started;}
 

diff --git a/EVE/EveHLT/AliEveHOMERManagerEditor.cxx b/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
index 15ca37b38c7aeb3b5c028c7e133ac5ef93241aa2..e9d7ca051cdc43f1cfc31cb1212c102812c2ce6a 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
+++ b/EVE/EveHLT/AliEveHOMERManagerEditor.cxx
@@ -109,13 +109,11 @@ void AliEveHOMERManagerEditor::SetModel(TObject* obj) {
 // }
 
 void AliEveHOMERManagerEditor::NextEvent() {
-  // call next event from macro
+  // call next event from AliEveHOMERManger
   fM->NextHOMEREvent();
 }
 
 void AliEveHOMERManagerEditor::WriteBlockListToFile() {
-  
-  
   gROOT->ProcessLineFast("writeToFile();");
 
 }
@@ -127,7 +125,8 @@ void AliEveHOMERManagerEditor::NavigateFwd() {
     if ( fM->NavigateEventBufferFwd() == -1 )
       return;
 
-    gROOT->ProcessLineFast("processEvent();");
+    fM->ProcessEvent();
+    //    gROOT->ProcessLineFast("processEvent();");
   }
   return;
 }
@@ -138,8 +137,9 @@ void AliEveHOMERManagerEditor::NavigateBack() {
   if ( !fEventLoopStarted ) {
     if ( fM->NavigateEventBufferBack() == -1 )
       return;
-
-    gROOT->ProcessLineFast("processEvent();");
+    
+    fM->ProcessEvent();
+    //gROOT->ProcessLineFast("processEvent();");
   }
   return;
 }

diff --git a/EVE/hlt-macros/od.C b/EVE/hlt-macros/od.C
index 195ceca1e44fbe5f12e6337aa4d88baf38db672c..1daf14f7751b2e9bf31bac41aa24dfa35e0f4ee0 100644 (file)
--- a/EVE/hlt-macros/od.C
+++ b/EVE/hlt-macros/od.C
@@ -837,10 +837,6 @@ Int_t processTRDCalibHistograms(AliHLTHOMERBlockDesc* block, TCanvas * canvas) {
  return iResult;
 }
 //****************************************************************************
-
-
-
-
 void writeToFile(){
 
   TList * bList = gHomerManager->GetBlockList();
@@ -854,8 +850,8 @@ void writeToFile(){
   if(bList){
     TFile * afile = TFile::Open(Form("Event_0x%016X_Async.root", gHomerManager->GetEventID()), "RECREATE"); 
     bList->Write("blockList", TObject::kSingleKey);
-  }afile->Close();
-    
+    afile->Close();
+  }
 }