Making AliDCSValue sortable (Vladimir)

[u/mrichter/AliRoot.git] / STEER / AliDisplay.cxx

diff --git a/STEER/AliDisplay.cxx b/STEER/AliDisplay.cxx
index 47fd86bafc969653520a783794b3c01e2a4d5bb9..8fdb111dc311402cae84499f16ebed023e47b145 100644 (file)
--- a/STEER/AliDisplay.cxx
+++ b/STEER/AliDisplay.cxx
@@ -23,6 +23,7 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+#include <RVersion.h>
 #include <TArc.h>
 #include <TButton.h>
 #include <TCanvas.h>
@@ -33,10 +34,15 @@
 #include <TPaveText.h>
 #include <TSlider.h>
 #include <TSliderBox.h>
-#include <TTree.h>
+//#include <TTree.h>
+#if ROOT_VERSION_CODE>= 331523
+#include <TView3D.h>
+#else
 #include <TView.h>
+#endif
 #include <TVirtualX.h>
 
+#include "AliLog.h"
 #include "AliDetector.h"
 #include "AliDisplay.h"
 #include "AliHeader.h"
@@ -47,8 +53,10 @@
 #include "TParticle.h"
 #include "AliMC.h"
 
-static const Float_t kptcutmax  = 2;
-static const Float_t ketacutmax = 1.5;
+const Float_t AliDisplay::fgkPtCutMax  = 2;
+const Float_t AliDisplay::fgkEtaCutMax = 1.5;
+const Int_t   AliDisplay::fgkMaxZooms = 20;
+
 
 ClassImp(AliDisplay)
 
@@ -247,13 +255,13 @@ AliDisplay::AliDisplay(Int_t size):
   fCutPad->SetFillColor(22);
   fCutPad->SetBorderSize(2);
   fCutSlider = new TSlider("pcut","Momentum cut",0,0,1,1);
-  fCutSlider->SetRange(fPTcut/kptcutmax,1);
+  fCutSlider->SetRange(fPTcut/fgkPtCutMax,1);
   fCutSlider->SetObject(this);
   fCutSlider->SetFillColor(45);
   TSliderBox *sbox = dynamic_cast<TSliderBox*>(fCutSlider->GetListOfPrimitives()->First());
   sbox->SetFillColor(46);
   fCutSlider->cd();
-  TGaxis *cutaxis = new TGaxis(0.02,0.8,0.98,0.8,0,kptcutmax,510,"");
+  TGaxis *cutaxis = new TGaxis(0.02,0.8,0.98,0.8,0,fgkPtCutMax,510,"");
   cutaxis->SetLabelSize(0.5);
   cutaxis->SetTitleSize(0.6);
   cutaxis->SetTitleOffset(0.5);
@@ -272,7 +280,7 @@ AliDisplay::AliDisplay(Int_t size):
   TSliderBox *sbox2 = dynamic_cast<TSliderBox*>(fEtaSlider->GetListOfPrimitives()->First());
   sbox2->SetFillColor(46);
   fEtaSlider->cd();
-  TGaxis *etaaxis = new TGaxis(0.9,0.02,0.9,0.98,-ketacutmax,ketacutmax,510,"");
+  TGaxis *etaaxis = new TGaxis(0.9,0.02,0.9,0.98,-fgkEtaCutMax,fgkEtaCutMax,510,"");
   etaaxis->SetLabelSize(0.5);
   etaaxis->SetTitleSize(0.6);
   etaaxis->SetTitleOffset(0.2);
@@ -342,12 +350,12 @@ void AliDisplay::Clear(Option_t *)
 }
 
 //_____________________________________________________________________________
-void AliDisplay::Copy(AliDisplay &) const
+void AliDisplay::Copy(TObject &) const
 {
   //
   // Copy *this onto disp -- not implemented
   //
-  Fatal("Copy","Not implemented~\n");
+  AliFatal("Not implemented");
 }
 
 //----------------------------------------------------------------------------
@@ -371,11 +379,11 @@ void AliDisplay::ShowTrack(Int_t idx)
         //         TClonesArray *particles=gAlice->Particles();
         //         TParticle *p = (TParticle*)particles->UncheckedAt(idx);
         TParticle *p = gAlice->GetMCApp()->Particle(idx);
-         printf("\nTrack index %d\n",idx);
-         printf("Particle ID %d\n",p->GetPdgCode());
-         printf("Parent %d\n",p->GetFirstMother());
-         printf("First child %d\n",p->GetFirstDaughter());
-         printf("Px,Py,Pz %f %f %f\n",p->Px(),p->Py(),p->Pz());
+         AliInfo(Form("Track index %d",idx));
+         AliInfo(Form("Particle ID %d",p->GetPdgCode()));
+         AliInfo(Form("Parent %d",p->GetFirstMother()));
+         AliInfo(Form("First child %d",p->GetFirstDaughter()));
+         AliInfo(Form("Px,Py,Pz %f %f %f",p->Px(),p->Py(),p->Pz()));
          return;
       }
    }
@@ -586,15 +594,15 @@ void AliDisplay::DrawHits()
    //Get cut slider
    smax   = fCutSlider->GetMaximum();
    smin   = fCutSlider->GetMinimum();
-   cutmin = kptcutmax*smin;
-   if (smax < 0.98) cutmax = kptcutmax*smax;
+   cutmin = fgkPtCutMax*smin;
+   if (smax < 0.98) cutmax = fgkPtCutMax*smax;
    else             cutmax = 100000;
    
    //Get eta slider
    smax   = fEtaSlider->GetMaximum();
    smin   = fEtaSlider->GetMinimum();
-   etamin = ketacutmax*(2*smin-1);
-   etamax = ketacutmax*(2*smax-1);
+   etamin = fgkEtaCutMax*(2*smin-1);
+   etamax = fgkEtaCutMax*(2*smax-1);
    if (smin < 0.02) etamin = -1000;
    if (smax > 0.98) etamax =  1000;
       
@@ -668,7 +676,13 @@ void AliDisplay::DrawView(Float_t theta, Float_t phi, Float_t psi)
    gPad->Clear();
 
    Int_t iret;
+#if ROOT_VERSION_CODE>= 331523
+   Double_t rmin[]={-1,-1,-1};
+   Double_t rmax[]={ 1, 1, 1};
+   TView *view = new TView3D(1,rmin,rmax);
+#else
    TView *view = new TView(1);
+#endif
    Float_t range = fRrange*fRangeSlider->GetMaximum();
    view->SetRange(-range,-range,-range,range, range, range);
    fZoomX0[0] = -1;
@@ -781,7 +795,7 @@ void AliDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
       if (x1 < x0) {temp = x0; x0 = x1; x1 = temp;}
       if (y1 < y0) {temp = y0; y0 = y1; y1 = temp;}
       gPad->Range(x0,y0,x1,y1);
-      if (fZooms < kMAXZOOMS-1) {
+      if (fZooms < fgkMaxZooms-1) {
          fZooms++;
          fZoomX0[fZooms] = x0;
          fZoomY0[fZooms] = y0;
@@ -848,8 +862,8 @@ void AliDisplay::LoadPoints()
          AliDetector* detector = dynamic_cast<AliDetector*>(module);
          if(detector)
            {
-             detector->TreeH()->GetEvent(track);
-             detector->LoadPoints(track);
+             if (detector->TreeH()->GetEvent(track))
+              detector->LoadPoints(track);
            }
       }
       next.Reset();
@@ -945,9 +959,8 @@ void AliDisplay::ShowNextEvent(Int_t delta)
      Int_t currentEvent = gAlice->GetRunLoader()->GetEventNumber();
      Int_t newEvent     = currentEvent + delta;
      gAlice->GetEvent(newEvent);
-     cout<<"AliDisplay::ShowNextEvent: delta = "<<delta
-         <<"  currentEvent = "<<currentEvent
-         <<"  newEvent = "<<newEvent<<endl;
+     AliInfo(Form("delta = %d  currentEvent = %d  newEvent = %d",
+                  delta, currentEvent, newEvent));
    }
   LoadPoints();
   fPad->cd();