Missing macro's compilation added to alieve_online_new.C. Bug causing disappearing...

[u/mrichter/AliRoot.git] / EVE / macros / alieve_online_new.C

diff --git a/EVE/macros/alieve_online_new.C b/EVE/macros/alieve_online_new.C
index 37518fc3b7ddb6c87927dba0d900f94404ab8006..dffdade4b73383b85c4af91cba47568d9a7b0709 100644 (file)
--- a/EVE/macros/alieve_online_new.C
+++ b/EVE/macros/alieve_online_new.C
@@ -64,8 +64,8 @@ void alieve_online_new()
     gSystem->cd(Form("%s/../src/",gSystem->Getenv("ALICE_ROOT")));
     gROOT->ProcessLine(".L saveViews.C+");
     gROOT->ProcessLine(".L geom_gentle.C+");
-    gROOT->ProcessLine(".L geom_gentle_muon.C+");
     gROOT->ProcessLine(".L geom_gentle_trd.C+");
+    gROOT->ProcessLine(".L geom_gentle_muon.C+");
     TEveUtil::LoadMacro("saveViews.C");
     gSystem->cd(hack);
     cout<<"Standard macros added"<<endl;
@@ -155,10 +155,12 @@ void alieve_online_new()
     TGLViewer *glv1 = multiView->Get3DView()->GetGLViewer();
     TGLViewer *glv2 = multiView->GetRPhiView()->GetGLViewer();
     TGLViewer *glv3 = multiView->GetRhoZView()->GetGLViewer();
+    TGLViewer *glv4 = multiView->GetMuonView()->GetGLViewer();
     
     glv1->CurrentCamera().RotateRad(-0.4, 0.6);
     glv2->CurrentCamera().Dolly(90, kFALSE, kFALSE);
-    glv3->CurrentCamera().Dolly(1700, kFALSE, kFALSE);
+    glv3->CurrentCamera().Dolly(2300, kFALSE, kFALSE);
+    glv4->CurrentCamera().Dolly(1, kFALSE, kFALSE);
     
     AliEveEventManager::GetMaster()->AddNewEventCommand("alieve_online_on_new_event();");
     gEve->FullRedraw3D();
@@ -171,8 +173,6 @@ void alieve_online_new()
 
 void alieve_online_on_new_event()
 {
-    AliSysInfo::AddStamp("on_new_event_start");
-       
     if (AliEveEventManager::HasESD())
       {
        Double_t x[3] = { 0, 0, 0 };
@@ -208,48 +208,27 @@ 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);
-     
-       AliSysInfo::AddStamp("on_new_event_pic");
-       // if (pichost == gSystem->HostName() && delta >= 30)
-       {
          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();
-     
-         Int_t status;
-     
+ 
          // create screenshots from OpenGL views
          saveViews(pic.Data());
      
          // 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()));
+         int status = gSystem->Exec(Form("SendImageToAmore %s %s %d",id.Data(),pic.Data(),esd->GetRunNumber()));
+           printf("Post AMORE reg -- status=%d, run=%d.\n", status, esd->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;
+         if (++g_pic_id >= g_pic_max) g_pic_id = 0;
          g_pic_prev.Set();
-       }
       }
-    AliSysInfo::AddStamp("on_new_event_end");
 }
 
 void alieve_init_import_macros()