bug fix in AliStorageEventManager

diff --git a/EVE/EveBase/AliEveEventManager.cxx b/EVE/EveBase/AliEveEventManager.cxx
index 708eecedceffad52a2ff60259e4409b64f8d47a5..9d8b8faf634e5d7cd387bc37478d3af5c1d72f39 100644 (file)
--- a/EVE/EveBase/AliEveEventManager.cxx
+++ b/EVE/EveBase/AliEveEventManager.cxx
@@ -764,10 +764,10 @@ void AliEveEventManager::Open()
 
 void AliEveEventManager::InitOCDB(int runNo)
 {
-               static const TEveException kEH("AliEveEventManager::InitOCDB ");
+  static const TEveException kEH("AliEveEventManager::InitOCDB ");
     //if (this == fgMaster)
     {
-        AliCDBManager* cdb = AliCDBManager::Instance();
+      AliCDBManager* cdb = AliCDBManager::Instance();
         if (cdb->IsDefaultStorageSet() == kTRUE)
         {
             Warning(kEH, "CDB already set - using the old storage:\n  '%s'",
@@ -799,7 +799,6 @@ void AliEveEventManager::InitOCDB(int runNo)
             if (cdb->IsDefaultStorageSet() == kFALSE)
                 throw kEH + "CDB initialization failed for '" + fgCdbUri + "'.";
         }
-
         if (fgCdbUri.BeginsWith("local://"))
         {
             TString curPath = gSystem->WorkingDirectory();
@@ -819,7 +818,7 @@ void AliEveEventManager::InitOCDB(int runNo)
                     cdb->SetSpecificStorage(grp, lpath);
                 }
             }
-        }
+       }
     }
 }
 
@@ -1214,7 +1213,7 @@ void AliEveEventManager::NextEvent()
             {
                 if(fCurrentEvent[fEventInUse]->GetRunNumber() >= 0)
                 {
-                    printf("======================= setting event to %d\n", fEventId);
+                 printf("======================= setting event to %d\n", fCurrentEvent[fEventInUse]->GetEventNumberInFile());
                     
                     DestroyElements();
                     InitOCDB(fCurrentEvent[fEventInUse]->GetRunNumber());

diff --git a/EVE/macros/alieve_online_new.C b/EVE/macros/alieve_online_new.C
index 9c5fbd1da3d029ca89944fd0fe50e72444ee5bfa..50931d85cecf9a66a2636c8e72968f64c7c5867d 100644 (file)
--- a/EVE/macros/alieve_online_new.C
+++ b/EVE/macros/alieve_online_new.C
@@ -48,11 +48,11 @@ void alieve_online_new()
     
     //These macros crashes on mac os. To be checked
     
-    //TEveUtil::LoadMacro("geom_gentle_trd.C");
-    //multiView->InitGeomGentleTrd(geom_gentle_trd());
+    TEveUtil::LoadMacro("geom_gentle_trd.C");
+    multiView->InitGeomGentleTrd(geom_gentle_trd());
     
-    //TEveUtil::LoadMacro("geom_gentle_muon.C");
-    //multiView->InitGeomGentleMuon(geom_gentle_muon(), kFALSE, kFALSE, kTRUE);
+    TEveUtil::LoadMacro("geom_gentle_muon.C");
+    multiView->InitGeomGentleMuon(geom_gentle_muon(), kFALSE, kFALSE, kTRUE);
     
     //============================================================================
     // Standard macros to execute -- not all are enabled by default.
@@ -188,46 +188,47 @@ void alieve_online_on_new_event()
         mv->SetCenterMuon(x[0], x[1], x[2]);
     mv->ImportEventMuon(top);
     
-    /*
+    
      // Register image to amore.
      // const TString pichost("aldaqacrs3");
      const TString pichost(gEnv->GetValue("AliEve.imageDumpHost", "localhost"));
      TTimeStamp now;
      Double_t delta = now.AsDouble() - g_pic_prev.AsDouble();
      
-     printf("Pre image dump: host='%s', delta=%f.\n",
-     gSystem->HostName(), delta);
+     printf("Pre image dump: host='%s', delta=%f.\n",gSystem->HostName(), delta);
      
      AliSysInfo::AddStamp("on_new_event_pic");
-     if (pichost == gSystem->HostName() && delta >= 30)
+     // if (pichost == gSystem->HostName() && delta >= 30)
      {
-     TString id;      id.Form("online-viz-%03d", g_pic_id);
-     TString pic(id); pic += ".png";
+       TString id;      id.Form("online-viz-%03d", g_pic_id);
+       TString pic(id); pic += ".png";
      
-     printf("In image dump: file='%s'.\n", pic.Data());
+       printf("In image dump: file='%s'.\n", pic.Data());
      
-     gEve->GetBrowser()->RaiseWindow();
-     gEve->FullRedraw3D();
-     gSystem->ProcessEvents();
+       gEve->GetBrowser()->RaiseWindow();
+       gEve->FullRedraw3D();
+       gSystem->ProcessEvents();
      
-     Int_t status;
+       Int_t status;
      
-     // create screenshots from OpenGL views
-     TEveUtil::LoadMacro("saveViews.C");
-     saveViews(pic.Data());
+       // create screenshots from OpenGL views
+       TEveUtil::LoadMacro("saveViews.C");
+       saveViews(pic.Data());
      
-     // send screenshot to AMORE
-     status = gSystem->Exec(TString::Format("SendImageToAmore %s %s %d",
-     id.Data(), pic.Data(),
-     AliEveEventManager::AssertESD()->GetRunNumber()));
+       // send screenshot to AMORE
+       cout<<"Sending:"<<TString::Format("SendImageToAmore %s %s %d",id.Data(), pic.Data(),AliEveEventManager::AssertESD()->GetRunNumber())<<endl;
+
+       status = gSystem->Exec(TString::Format("SendImageToAmore %s %s %d",
+                                             id.Data(), pic.Data(),
+                                             AliEveEventManager::AssertESD()->GetRunNumber()));
      
-     printf("Post AMORE reg -- status=%d, run=%d.\n", status,
-     AliEveEventManager::AssertESD()->GetRunNumber());
+       printf("Post AMORE reg -- status=%d, run=%d.\n", status,
+             AliEveEventManager::AssertESD()->GetRunNumber());
      
-     if (++g_pic_id >= g_pic_max)
-     g_pic_id = 0;
-     g_pic_prev.Set();
-     }*/
+       if (++g_pic_id >= g_pic_max)
+        g_pic_id = 0;
+       g_pic_prev.Set();
+     }
     AliSysInfo::AddStamp("on_new_event_end");
 }
 

diff --git a/MONITOR/alistoragemanager/AliStorageEventManager.cxx b/MONITOR/alistoragemanager/AliStorageEventManager.cxx
index 455e5ccd4ed39fbd9fa65508a43c704789046fcd..1f28d067cb4291cab0a92abbc75c4a2078530ceb 100644 (file)
--- a/MONITOR/alistoragemanager/AliStorageEventManager.cxx
+++ b/MONITOR/alistoragemanager/AliStorageEventManager.cxx
@@ -477,8 +477,13 @@ vector<serverListStruct> AliStorageEventManager::GetServerListVector(storageSock
 AliESDEvent* AliStorageEventManager::GetEvent(storageSockets socket,int timeout)
 {
     pollitem_t items[1] =  {{*fSockets[socket],0,ZMQ_POLLIN,0}} ;
-    if(timeout>=0){if(poll (&items[0], 1, timeout)==0){return NULL;}}
-    
+    if(timeout>=0){
+       try{(poll (&items[0], 1, timeout)==0);}
+       catch(const zmq::error_t &e){
+         cout<<"EVENT MANAGER -- GetEvent():"<<e.what()<<endl;
+           return NULL;
+         }
+    }
     message_t* message = new message_t();
     
     try
@@ -490,7 +495,6 @@ AliESDEvent* AliStorageEventManager::GetEvent(storageSockets socket,int timeout)
         cout<<"MANAGER -- "<<e.what()<<endl;
         return NULL;
     }
-    
     TBufferFile *mess = new TBufferFile(TBuffer::kRead,
                                         message->size()+sizeof(UInt_t),
                                         message->data());