]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Display and points are removed, DispFast is to be used
authorkir <kir@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 28 May 2004 12:24:07 +0000 (12:24 +0000)
committerkir <kir@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 28 May 2004 12:24:07 +0000 (12:24 +0000)
RICH/AliRICHDisplay.cxx [deleted file]
RICH/AliRICHDisplay.h [deleted file]
RICH/AliRICHPoints.cxx [deleted file]
RICH/AliRICHPoints.h [deleted file]
RICH/RICHLinkDef.h
RICH/libRICH.pkg

diff --git a/RICH/AliRICHDisplay.cxx b/RICH/AliRICHDisplay.cxx
deleted file mode 100644 (file)
index ea7bed2..0000000
+++ /dev/null
@@ -1,1087 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-
-//////////////////////////////////////////////////////////////////////////
-//                                                                      //
-// AliDisplay                                                           //
-//                                                                      //
-// Utility class to display ALICE outline, tracks, hits,..              //
-//                                                                      //
-//////////////////////////////////////////////////////////////////////////
-
-#include <TROOT.h>
-#include <TTree.h>
-#include <TButton.h>
-#include <TColor.h>
-#include <TCanvas.h>
-#include <TView.h>
-#include <TText.h>
-#include <TPolyMarker3D.h>
-#include <TAtt3D.h>
-#include <TAttLine.h>
-#include <TPolyMarker.h>
-#include <TPaveLabel.h>
-#include <TPaveText.h>
-#include <TList.h>
-#include <TDiamond.h>
-#include <TNode.h>
-#include <TArc.h>
-#include <TTUBE.h>
-#include <TSlider.h>
-#include <TGeometry.h>
-#include <TSliderBox.h>
-#include <TGaxis.h>
-#include <TVirtualX.h>
-#include <TMath.h>
-#include <TRandom.h>
-#include <X3DBuffer.h>
-#include <TParticle.h>
-#include "AliRICHChamber.h"
-#include "AliRun.h"
-#include "AliPDG.h"
-#include "AliDetector.h"
-#include "AliRICH.h"
-#include "AliRICHDisplay.h"
-#include "AliRICHPoints.h"
-#include "AliHeader.h"
-
-#include "AliMC.h"
-
-ClassImp(AliRICHDisplay)
-    
-
-//____________________________________________________________________________
-AliRICHDisplay::AliRICHDisplay()
-{ 
-
-// default constructor
-    fColPad = 0;
-    fPoints = 0;
-    fPhits = 0;
-    fPCerenkovs = 0;
-    fCanvas = 0;
-    fRpoints = 0;
-    fRecpoints = 0; 
-}
-
-//_____________________________________________________________________________
-AliRICHDisplay::AliRICHDisplay(Int_t size)
-{
-    
-    fPad = 0;
-    
-    gAlice->SetDisplay(this);
-    
-    // Initialize display default parameters
-    SetRange();
-    
-    // Set front view by default
-    fTheta = 90;              //inclined HMPID
-    fPhi   = 30;              //inclined HMPID
-    //fTheta = 90;               //normal HMPID
-    //fPhi   = 90;                //normal HMPID
-    fPsi   = 0;
-    fChamber = 1;
-    fCathode = 1;
-    //   fRzone   = 1.e10;
-    fDrawClusters  = kTRUE;
-    fDrawCoG       = kTRUE;
-    fDrawRecHits   = kTRUE;
-    fZoomMode      = 1;
-    fZooms         = 0;
-    fClustersCuts  = 0;
-    fPoints        = 0;
-    fPCerenkovs    = 0;
-    fPhits         = 0;
-    fRpoints       = 0;   
-    fRecpoints       = 0;
-    // Create colors
-    CreateColors();
-    // Create display canvas
-    Int_t ysize = size;
-    if (ysize < 100) ysize = 750;
-    Int_t xsize = Int_t(size*830./ysize);
-    fCanvas = new TCanvas("Canvas", "RICH Clusters Display",14,47,xsize,ysize);
-    fCanvas->ToggleEventStatus();
-    
-    // Create main display pad
-    fPad = new TPad("viewpad", "RICH display",0.15,0,0.9,1);
-    fPad->Draw();
-    fPad->Modified();
-    fPad->SetFillColor(1);
-    fPad->SetBorderSize(2);
-    
-    fCanvas->cd();
-    
-    // Create colors pad
-    fColPad = new TPad("colpad", "Colors pad",0.9,0,1,1);
-    fColPad->Draw();
-    fColPad->Modified();
-    fColPad->SetFillColor(19);
-    fColPad->SetBorderSize(2);
-    fColPad->cd();
-    DisplayColorScale();
-    
-    fCanvas->cd();
-    
-    // Create user interface control pad
-    DisplayButtons();
-    fCanvas->cd();
-    
-    // Create Range and mode pad
-    Float_t dxtr     = 0.15;
-    Float_t dytr     = 0.45;
-    fTrigPad = new TPad("trigger", "range and mode pad",0,0,dxtr,dytr);
-    fTrigPad->Draw();
-    fTrigPad->cd();
-    fTrigPad->SetFillColor(22);
-    fTrigPad->SetBorderSize(2);
-    fRangeSlider = new TSlider("range","range",0.7,0.42,0.9,0.98);
-    fRangeSlider->SetObject(this);
-    char pickmode[] = "gAlice->Display()->SetPickMode()";
-    Float_t db = 0.09;
-    fPickButton = new TButton("Pick",pickmode,0.05,0.32,0.65,0.32+db);
-    fPickButton->SetFillColor(38);
-    fPickButton->Draw();
-    char zoommode[] = "gAlice->Display()->SetZoomMode()";
-    fZoomButton = new TButton("Zoom",zoommode,0.05,0.21,0.65,0.21+db);
-    fZoomButton->SetFillColor(38);
-    fZoomButton->Draw();
-    fArcButton = new TArc(.8,fZoomButton->GetYlowNDC()+0.5*db,0.33*db);
-    fArcButton->SetFillColor(kGreen);
-    fArcButton->Draw();
-    char butUnzoom[] = "gAlice->Display()->UnZoom()";
-    TButton *button = new TButton("UnZoom",butUnzoom,0.05,0.05,0.95,0.15);
-    button->SetFillColor(38);
-    button->Draw();
-    AppendPad(); // append display object as last object to force selection
-    
-    fTrigPad->SetEditable(kFALSE);
-    fButtons->SetEditable(kFALSE);
-    fCanvas->cd();
-    fCanvas->Update();
-}
-
-
-//_____________________________________________________________________________
-AliRICHDisplay::~AliRICHDisplay()
-{
-    // Delete space point structure
-    if (fPoints) fPoints->Delete();
-    delete fPoints;
-    fPoints     = 0;
-    //
-    if (fPhits) fPhits->Delete();
-    delete fPhits;
-    fPhits     = 0;
-    //
-    if (fRpoints) fRpoints->Delete();
-    delete fRpoints;
-    fRpoints     = 0;
-    //
-    if (fRecpoints) fRecpoints->Delete();
-    delete fRecpoints;
-    fRecpoints     = 0;
-    //
-    if (fPCerenkovs) fPCerenkovs->Delete();
-    delete fPCerenkovs;
-    fPCerenkovs     = 0;
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::Clear(Option_t *)
-{
-//    Delete graphics temporary objects
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DisplayButtons()
-{
-//    Create the user interface buttons
-    
-    
-    fButtons = new TPad("buttons", "newpad",0,0.45,0.15,1);
-    fButtons->Draw();
-    fButtons->SetFillColor(38);
-    fButtons->SetBorderSize(2);
-    fButtons->cd();
-    
-    //   Int_t butcolor = 33;
-    Float_t dbutton = 0.08;
-    Float_t y  = 0.96;
-    Float_t dy = 0.014;
-    Float_t x0 = 0.05;
-    Float_t x1 = 0.95;
-    
-    TButton *button;
-    char but1[] = "gAlice->Display()->ShowNextEvent(1)";
-    button = new TButton("Next",but1,x0,y-dbutton,x1,y);
-    button->SetFillColor(38);
-    button->Draw();
-    
-    y -= dbutton +dy;
-    char but2[] = "gAlice->Display()->ShowNextEvent(-1)";
-    button = new TButton("Previous",but2,x0,y-dbutton,x1,y);
-    button->SetFillColor(38);
-    button->Draw();
-
-    y -= dbutton +dy;
-    char but7[] = "gAlice->Display()->DrawViewGL()";
-    button = new TButton("OpenGL",but7,x0,y-dbutton,x1,y);
-    button->SetFillColor(38);
-    button->Draw();
-    
-    y -= dbutton +dy;
-    char but8[] = "gAlice->Display()->DrawViewX3D()";
-    button = new TButton("X3D",but8,x0,y-dbutton,x1,y);
-    button->SetFillColor(38);
-    button->Draw();
-    
-    // display logo
-    TDiamond *diamond = new TDiamond(0.05,0.015,0.95,0.22);
-    diamond->SetFillColor(50);
-    diamond->SetTextAlign(22);
-    diamond->SetTextColor(5);
-    diamond->SetTextSize(0.11);
-    diamond->Draw();
-    diamond->AddText(".. ");
-    diamond->AddText("ROOT");
-    diamond->AddText("RICH");
-    diamond->AddText("... ");
-    diamond->AddText(" ");
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::CreateColors()
-{
-//    Create the colors palette used to display clusters
-    
-    Int_t k,i;
-    Int_t color;
-    Float_t r,g,b;
-    
-    for (k=1;k<=5;k++) {
-       switch(k) {
-       case 1:
-           for (i=1;i<=5;i++) {
-               r=1.;
-               g=i*0.2;  
-               b=0.;
-               color=i;
-               color=700+23-color;
-               new TColor(color,r,g,b);
-           } 
-           break;
-       case 2:
-           for (i=1;i<=4;i++) {
-               r=1.1-i*0.2;
-               g=1.;  
-               b=0.;
-               color=i+5;
-               color=700+23-color;
-               new TColor(color,r,g,b);
-           } 
-           break;
-    case 3:
-       for (i=1;i<=4;i++) {
-           r=0.;
-           g=1.;  
-           b=i*0.2+0.2;
-           color=i+9;
-           color=700+23-color;
-           new TColor(color,r,g,b);
-       } 
-       break;
-       case 4:
-           for (i=1;i<=4;i++) {
-               r=0.;
-               g=1.1-i*0.2;  
-               b=1.;
-               color=i+13;
-               color=700+23-color;
-               new TColor(color,r,g,b);
-           } 
-           break;
-       case 5:
-           for (i=1;i<=5;i++) {
-               r=i*0.2;
-               g=0.;  
-               b=1.;
-               color=i+17;
-               color=700+23-color;
-               new TColor(color,r,g,b);
-           } 
-           break;
-       }
-    }
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DisplayColorScale()
-{
-
-// Draw the color scale in the RICH display canvas
-    
-    Int_t i;
-    Int_t color;
-    Float_t xlow, ylow, xup, yup, hs;
-    Float_t x1, y1, x2, y2;
-    x1 = y1 = 0;
-    x2 = y2 = 20;
-    
-    gPad->SetFillColor(0);
-    gPad->Clear();
-    gPad->Range(x1,y1,x2,y2);
-    TText *text = new TText(0,0,"");
-    text->SetTextFont(61);
-    text->SetTextSize(0.2);
-    text->SetTextAlign(22);
-    
-    TBox *box;
-    char label[8];
-//*-* draw colortable boxes
-    hs = (y2-y1)/Float_t(22);
-    xlow=x1+1;
-    xup=x2-9;
-    for (i=0;i<22;i++) {
-       ylow = y1 + hs*(Float_t(i));
-       yup  = y1 + hs*(Float_t(i+1));
-       color = 701+i;
-       Double_t logscale=Double_t(i+1)*(TMath::Log(kadc_satm)/22);
-       Int_t scale=(Int_t)TMath::Exp(logscale);
-       sprintf(label,"%d",scale);
-       box = new TBox(xlow, ylow, xup, yup);
-       box->SetFillColor(color);
-       box->Draw();
-       text->DrawText(xup+4, 0.5*(ylow+yup),label);
-    }
-}
-
-//______________________________________________________________________________
-Int_t AliRICHDisplay::DistancetoPrimitive(Int_t px, Int_t)
-{
-// Compute distance from point px,py to objects in event
-    
-    gPad->SetCursor(kCross);
-    
-    if (gPad == fTrigPad) return 9999;
-    
-    const Int_t kBig = 9999;
-    Int_t dist   = kBig;
-    Float_t xmin = gPad->GetX1();
-    Float_t xmax = gPad->GetX2();
-    Float_t dx   = 0.02*(xmax - xmin);
-    Float_t x    = gPad->AbsPixeltoX(px);
-    if (x < xmin+dx || x > xmax-dx) return dist;
-    if (fZoomMode) return 0;
-    else           return 7;
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::Draw(Option_t *)
-{
-//    Display current event
-
-    fPad->cd();
-    
-    DrawView(fTheta, fPhi, fPsi);      // see how to draw PGON+inner frames
-    
-    // Display the event number and title
-    fPad->cd();
-    DrawTitle();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DrawCoG()
-{
-//    Draw hits for RICH chambers
-
-    if (!fDrawCoG) return;
-    ResetRpoints();
-    for (Int_t chamber=0;chamber<kNCH;chamber++) {
-       LoadCoG(chamber,1);
-    }
-    
-    Int_t ncog, icog;
-    TObjArray *points;
-    AliRICHPoints *pm;
-    points = fRpoints;
-    if (!points) return;
-    ncog = points->GetEntriesFast();
-    for (icog=0; icog < ncog; icog++) {
-       pm = (AliRICHPoints*)points->UncheckedAt(icog);
-       if (!pm) continue;
-       pm->Draw();
-    }
-}
-
-void AliRICHDisplay::DrawRecHits()
-{
-//    Draw rec hits for RICH chambers
-
-    if (!fDrawRecHits) return;
-    //ResetRecpoints();
-    for (Int_t chamber=0;chamber<kNCH;chamber++) {
-       LoadRecHits(chamber,1);
-    }
-    
-    Int_t nrec, irec;
-    TObjArray *points;
-    AliRICHPoints *pm;
-    points = fRecpoints;
-    if (!points) return;
-    nrec = points->GetEntriesFast();
-    //printf("Nrec %d\n",nrec);
-    for (irec=0; irec < nrec; irec++) {
-       pm = (AliRICHPoints*)points->UncheckedAt(irec);
-       if (!pm) continue;
-       pm->Draw();
-    }
-}
-
-//_____________________________________________________________________________
-
-void AliRICHDisplay::DrawCerenkovs()
-{
-//    Draw cerenkovs hits for RICH chambers
-    
-    LoadCerenkovs(fChamber);
-    //printf("\nDrawCerenkovs\n");
-    
-    Int_t ntracks, track;
-    TObjArray *cpoints;
-    AliRICHPoints *pm;
-    
-    fHitsCuts = 0;
-    cpoints = fPCerenkovs;
-    //printf ("Cpoints: %p",cpoints);
-    if (!cpoints) return;
-    ntracks = cpoints->GetEntriesFast();
-    //printf("DrawCerenkovs - ntracks %d \n",ntracks);
-    for (track=0;track<ntracks;track++) {
-       pm = (AliRICHPoints*)cpoints->UncheckedAt(track);
-       if (!pm) continue;
-       pm->Draw();
-       fHitsCuts += pm->GetN();
-    }
-}
-
-//_____________________________________________________________________________
-
-void AliRICHDisplay::DrawClusters()
-{
-//    Draw clusterss for RICH chambers
-    
-    Int_t ndigits, digit;
-    TObjArray *points;
-    AliRICHPoints *pm;
-    
-    fClustersCuts = 0;
-    points = fPoints;
-    if (!points) return;
-    ndigits = points->GetEntriesFast();
-    for (digit=0;digit<ndigits;digit++){
-       pm = (AliRICHPoints*)points->UncheckedAt(digit);
-       if (!pm) continue;
-       pm->Draw();
-       Float_t *pxyz;
-       pxyz=pm->GetP();
-       for (Int_t im=0;im<3;im++) {
-           TMarker3DBox *marker=pm->GetMarker(im);
-           if (marker)
-               marker->Draw();
-       }
-       fClustersCuts +=pm->GetN();
-    }
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DrawHits()
-{
-//    Draw hits for RICH chambers
-    
-    LoadHits(fChamber);
-    
-    Int_t ntracks, track;
-    TObjArray *points;
-    AliRICHPoints *pm;
-    
-    fHitsCuts = 0;
-    points = Phits();
-    if (!fPhits) return;
-//    ntracks = points->GetEntriesFast();
-    ntracks = fPhits->GetEntriesFast();
-    
-    //printf("DrawHits - ntracks %d \n",ntracks);
-    for (track=0;track<ntracks;track++) {
-       pm = (AliRICHPoints*)fPhits->UncheckedAt(track);
-       if (!pm) continue;
-       pm->Draw();
-       fHitsCuts += pm->GetN();
-    }
-}
-
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DrawTitle(Option_t *option)
-{
-//    Draw the event title
-    
-    Float_t xmin = gPad->GetX1();
-    Float_t xmax = gPad->GetX2();
-    Float_t ymin = gPad->GetY1();
-    Float_t ymax = gPad->GetY2();
-    Float_t dx   = xmax-xmin;
-    Float_t dy   = ymax-ymin;
-    
-    if (strlen(option) == 0) {
-       TPaveText *title = new TPaveText(xmin +0.01*dx, ymax-0.09*dy, xmin +0.5*dx, ymax-0.01*dy);
-       title->SetBit(kCanDelete);
-       title->SetFillColor(42);
-       title->Draw();
-       char ptitle[100];
-       sprintf(ptitle,"Alice event: %d, Run:%d",
-               gAlice->GetHeader()->GetEvent(), gAlice->GetHeader()->GetRun());
-       title->AddText(ptitle);
-       Int_t nparticles = gAlice->GetMCApp()->Particles()->GetEntriesFast();
-       sprintf(ptitle,"Nparticles = %d Nhits = %d Npads fired = %d",
-               nparticles, fHitsCuts,fClustersCuts);
-       title->AddText(ptitle);
-    } else {
-       TPaveLabel *label = 
-           new TPaveLabel(xmin +0.01*dx, ymax-0.07*dy, xmin +0.2*dx, ymax-0.01*dy,option);
-       label->SetBit(kCanDelete);
-       label->SetFillColor(42);
-       label->Draw();
-    }
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DrawView(Float_t theta, Float_t phi, Float_t psi)
-{
-//    Draw a view of RICH clusters
-    
-   gPad->SetCursor(kWatch);
-   gPad->SetFillColor(1);
-   gPad->Clear();
-   
-   Int_t iret;
-   TView *view = new TView(1);
-   Float_t range = fRrange*fRangeSlider->GetMaximum();
-   view->SetRange(-range,-range,-range,range, range, range);
-   fZoomX0[0] = -1;
-   fZoomY0[0] = -1;
-   fZoomX1[0] =  1;
-   fZoomY1[0] =  1;
-   fZooms = 0;
-   
-   //Display RICH Chamber Geometry
-   gAlice->GetGeometry()->Draw("same");
-   
-   //add clusters to the pad
-   DrawClusters();
-   DrawHits();
-   //DrawCerenkovs();
-   if (gAlice->TreeR())
-     {
-       //printf("Calling DrawCoG\n");
-        DrawCoG();
-       //printf("Calling DrawRecHits\n");
-        DrawRecHits();
-     }
-   /*for (Int_t i=0;i<7;i++)
-     LoadRecHits(i,1);*/
-   
-   // add itself to the list (must be last)
-   AppendPad();
-   
-   view->SetView(phi, theta, psi, iret);
-}
-
-//______________________________________________________________________________
-void AliRICHDisplay::ExecuteEvent(Int_t event, Int_t px, Int_t py)
-{
-//  Execute action corresponding to the mouse event
-    
-    static Float_t x0, y0, x1, y1;
-    
-   static Int_t pxold, pyold;
-   static Int_t px0, py0;
-   static Int_t linedrawn;
-   Float_t temp;
-   
-   if (px == 0 && py == 0) { //when called by sliders
-       if (event == kButton1Up) {
-        printf("Drawing event %d\n",event);
-        Draw();
-       }
-       return;
-   }
-   if (!fZoomMode && gPad->GetView()) {
-       gPad->GetView()->ExecuteRotateView(event, px, py);
-       return;
-   }
-
-   // something to zoom ?
-   gPad->SetCursor(kCross);
-   
-   switch (event) {
-       
-   case kButton1Down:
-       gVirtualX->SetLineColor(-1);
-       gPad->TAttLine::Modify();  //Change line attributes only if necessary
-       x0 = gPad->AbsPixeltoX(px);
-       y0 = gPad->AbsPixeltoY(py);
-       px0   = px; py0   = py;
-       pxold = px; pyold = py;
-       linedrawn = 0;
-       return;
-       
-   case kButton1Motion:
-       if (linedrawn) gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
-       pxold = px;
-       pyold = py;
-       linedrawn = 1;
-       gVirtualX->DrawBox(px0, py0, pxold, pyold, TVirtualX::kHollow);
-       return;
-       
-   case kButton1Up:
-       gPad->GetCanvas()->FeedbackMode(kFALSE);
-       if (px == px0) return;
-       if (py == py0) return;
-       x1 = gPad->AbsPixeltoX(px);
-       y1 = gPad->AbsPixeltoY(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 < kMAXZOOM-1) {
-          fZooms++;
-          fZoomX0[fZooms] = x0;
-          fZoomY0[fZooms] = y0;
-          fZoomX1[fZooms] = x1;
-          fZoomY1[fZooms] = y1;
-       }
-       gPad->Modified(kTRUE);
-       return;
-   }
-   
-}
-//___________________________________________
-void AliRICHDisplay::LoadCoG(Int_t chamber, Int_t cathode)
-{
-// Read raw clusters info and store x,y,z info in arrays fRpoints
-// Loop on all detectors
-
-   if (chamber > 7) return;
-
-   AliRICH *pRICH  = (AliRICH*)gAlice->GetModule("RICH");
-   AliRICHChamber*  iChamber;
-
-   TClonesArray *pRICHrawclust  = pRICH->Clusters(chamber);
-   if (pRICHrawclust == 0) return;
-
-   pRICH->ResetClusters();
-
-
-   Int_t nent=(Int_t)gAlice->TreeR()->GetEntries();
-   gAlice->TreeR()->GetEvent(nent-1+cathode-1);
-   Int_t nrawcl = pRICHrawclust->GetEntriesFast();
-   //printf ("nrawcl:%d\n",nrawcl);
-   if (nrawcl == 0) return;
-   if (fRpoints == 0) fRpoints = new TObjArray(nrawcl);
-   
-   iChamber = pRICH->C(chamber);
-   AliRICHcluster  *mRaw;
-   AliRICHPoints *points = 0;
-   //
-   //loop over all raw clusters and store their position
-   points = new AliRICHPoints(nrawcl);
-   for (Int_t iraw=0;iraw<nrawcl;iraw++) {
-       mRaw   = (AliRICHcluster*)pRICHrawclust->UncheckedAt(iraw);
-       fRpoints->AddAt(points,iraw);
-       points->SetMarkerColor(3);
-       points->SetMarkerStyle(3);
-       points->SetMarkerSize(1.);
-       points->SetParticle(-1);
-       points->SetHitIndex(-1);
-       points->SetTrackIndex(-1);
-       points->SetDigitIndex(-1);
-       Float_t  vectorLoc[3]={mRaw->X(),5,mRaw->Y()};
-       Float_t  vectorGlob[3];
-       iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
-       points->SetPoint(iraw,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
-   }
-}//LoadCoG()
-//___________________________________________
-void AliRICHDisplay::LoadRecHits(Int_t chamber, Int_t cathode)
-{
-  chamber++;cathode++;
-}
-//___________________________________________
-void AliRICHDisplay::LoadDigits()
-{
-// Read digits info and store x,y,z info in arrays fPoints
-// Loop on all detectors
-    
-   ResetPoints();
-   AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
-   AliRICHChamber*       iChamber;
-   Int_t nAllDigits=0;
-   Int_t ich;
-
-   //printf("Entering LoadDigits\n");
-
-   if (gAlice->TreeD())
-     {
-   
-       for (ich=1; ich<=kNCH; ich++) {
-        TClonesArray *pRICHdigits  = pRICH->Digits(ich);
-        if (pRICHdigits == 0) continue;
-        gAlice->ResetDigits();
-        gAlice->TreeD()->GetEvent(0);
-        Int_t ndigits = pRICHdigits->GetEntriesFast();
-        nAllDigits+=ndigits;
-       }
-       
-       if (fPoints == 0) fPoints = new TObjArray(nAllDigits);   
-       Int_t counter=0;
-       for (ich=1; ich<=kNCH; ich++) {
-        TClonesArray *pRICHdigits  = pRICH->Digits(ich);
-        if (pRICHdigits == 0) continue;
-        gAlice->ResetDigits();
-        gAlice->TreeD()->GetEvent(0);
-        Int_t ndigits = pRICHdigits->GetEntriesFast();
-        if (ndigits == 0) continue;
-        iChamber = pRICH->C(ich);
-        Float_t dpx  = AliRICHParam::PadSizeX();
-        Float_t dpy  = AliRICHParam::PadSizeY();
-        
-        
-        AliRICHdigit  *mdig;
-        AliRICHPoints *points = 0;
-        TMarker3DBox  *marker = 0;
-        //
-        //loop over all digits and store their position
-        Int_t npoints=1;
-        
-        for (Int_t digit=0;digit<ndigits;digit++) {
-          mdig    = (AliRICHdigit*)pRICHdigits->UncheckedAt(digit);
-          points = new AliRICHPoints(npoints);
-          fPoints->AddAt(points,counter);
-          counter++;
-          Int_t charge=(Int_t)mdig->Q();
-          Int_t index=Int_t(TMath::Log(charge)/(TMath::Log(kadc_satm)/22));
-          Int_t color=701+index;
-          if (color>722) color=722;
-          points->SetMarkerColor(color);
-          points->SetMarkerStyle(21);
-          points->SetMarkerSize(0.5);
-          Float_t xpad, ypad;
-          Float_t vectorLoc[3]={xpad,5,ypad};
-          Float_t  vectorGlob[3];
-          iChamber->LocaltoGlobal(vectorLoc,vectorGlob);
-          points->SetParticle(-1);
-          points->SetHitIndex(-1);
-          points->SetTrackIndex(-1);
-          points->SetDigitIndex(digit);
-          points->SetPoint(0,vectorGlob[0],vectorGlob[1],vectorGlob[2]);
-          //printf("Y position (digit): %f\n", vectorGlob[1]);
-          
-          Float_t theta = iChamber->GetRotMatrix()->GetTheta();
-          Float_t phi   = iChamber->GetRotMatrix()->GetPhi();     
-          marker=new TMarker3DBox(vectorGlob[0],vectorGlob[1],vectorGlob[2],
-                                  dpy/2,0,dpx/2,theta,phi);
-          marker->SetLineColor(2);
-          marker->SetFillStyle(1001);
-          marker->SetFillColor(color);
-          marker->SetRefObject((TObject*)points);
-          points->Set3DMarker(0, marker);
-        } // loop over digits
-       } // loop over chambers 
-     } //if TreeD
-}//LoadDigits();
-//__________________________________________________________________________________________________
-void AliRICHDisplay::LoadHits(Int_t chamber)
-{
-// Read hits info and store x,y,z info in arrays fPhits
-// Loop on all detectors
-    
-    
-    fChamber=chamber; 
-    ResetPhits();
-    
-    AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
-    AliRICHChamber*  iChamber;
-    
-    iChamber = pRICH->C(chamber-1);
-    Int_t ntracks = (Int_t)pRICH->TreeH()->GetEntries();
-    Int_t track;
-    
-    if (fPhits == 0) fPhits = new TObjArray(ntracks);
-    //TVector *xp = new TVector(1000);
-    //TVector *yp = new TVector(1000);
-    //TVector *zp = new TVector(1000);
-    //TVector *ptrk = new TVector(1000);
-    //TVector *phit = new TVector(1000);
-    Int_t nAllHits=0;
-    for (track=0; track<ntracks;track++) {
-       gAlice->ResetHits();
-       pRICH->TreeH()->GetEvent(track);
-       TClonesArray *pRICHhits  = pRICH->Hits();
-       if (pRICHhits == 0) return;
-       Int_t nhits = pRICHhits->GetEntriesFast();
-       nAllHits+=nhits;
-    }
-
-    fPhits = new TObjArray(nAllHits);
-
-    Int_t npoints=0;
-    for (track=0; track<ntracks;track++) {
-       gAlice->ResetHits();
-       pRICH->TreeH()->GetEvent(track);
-       TClonesArray *pRICHhits  = pRICH->Hits();
-       if (pRICHhits == 0) return;
-       Int_t nhits = pRICHhits->GetEntriesFast();
-       if (nhits == 0) continue;
-       AliRICHhit *mHit;
-       AliRICHPoints *points = 0;
-       for (Int_t hit=0;hit<nhits;hit++) {
-           points = new AliRICHPoints(1);
-           fPhits->AddAt(points,npoints);
-            mHit = (AliRICHhit*)pRICHhits->UncheckedAt(hit);
-           TParticle *current = (TParticle*)gAlice->GetMCApp()->Particle(mHit->Track());
-           if (current->GetPdgCode() == 50000050) {
-               points->SetMarkerColor(kBlue);
-           } else if (current->GetPdgCode() == 50000051) {
-               points->SetMarkerColor(kYellow);
-           } else {
-               points->SetMarkerColor(kRed);
-           }
-            points->SetMarkerStyle(5);
-            points->SetMarkerSize(1.);
-            points->SetParticle(mHit->Track());
-           points->SetHitIndex(hit);
-            points->SetTrackIndex(track);
-            points->SetDigitIndex(-1);
-            points->SetPoint(0,mHit->X(), mHit->Y(), mHit->Z());
-           npoints++;
-       }
-    }
-}//LoadHits()
-//__________________________________________________________________________________________________
-void AliRICHDisplay::LoadCerenkovs(Int_t chamber)
-{
-// Read cerenkov hits info and store x,y,z info in array fPCerenkovs
-// Loop on all detectors
-  chamber++;    
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::Paint(Option_t *)
-{
-//    Paint miscellaneous items
-
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::SetPickMode()
-{
-
-// Toggle pick mode
-
-    fZoomMode = 0;
-    
-    fArcButton->SetY1(fPickButton->GetYlowNDC()+0.5*fPickButton->GetHNDC());
-    fTrigPad->Modified();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::SetZoomMode()
-{
-
-// Toggle Zoom mode
-
-    fZoomMode = 1;
-    
-    fArcButton->SetY1(fZoomButton->GetYlowNDC()+0.5*fZoomButton->GetHNDC());
-    fTrigPad->Modified();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::SetChamberAndCathode(Int_t chamber, Int_t cathode)
-{
-// Set chamber and cathode number
-    fChamber = chamber;
-    fCathode = cathode;
-    
-    //printf("SetChamberAndCathode - fChamber fCathode %d %d\n",fChamber,fCathode);
-    if (!fPad) return;
-    fPad->Clear();
-    LoadDigits();
-    Draw();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::SetRange(Float_t rrange, Float_t zrange)
-{
-// Set view range along R and Z
-    fRrange = rrange;
-    fZrange = zrange;
-    
-   if (!fPad) return;
-   fPad->Clear();
-   Draw();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::SetView(Float_t theta, Float_t phi, Float_t psi)
-{
-//  change viewing angles for current event
-    
-    fPad->cd();
-    fPhi   = phi;
-    fTheta = theta;
-    fPsi   = psi;
-    Int_t iret = 0;
-    
-    TView *view = gPad->GetView();
-    if (view) view->SetView(fPhi, fTheta, fPsi, iret);
-    else      Draw();
-    
-    gPad->Modified();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::ShowNextEvent(Int_t delta)
-{
-//  Display (current event_number+delta)
-//    delta =  1  shown next event
-//    delta = -1 show previous event
-    
-    if (delta) {
-       gAlice->Clear();
-       Int_t currentEvent = gAlice->GetHeader()->GetEvent();
-       Int_t newEvent     = currentEvent + delta;
-       gAlice->GetEvent(newEvent);
-       if (!gAlice->TreeD()) return; 
-    }
-    LoadDigits();
-    DrawClusters();
-    fPad->cd(); 
-    Draw();
-
-  
-}
-
-//______________________________________________________________________________
-void AliRICHDisplay::UnZoom()
-{
-
-// Return to previous zoom factor
-
-    if (fZooms <= 0) return;
-    fZooms--;
-    TPad *pad = (TPad*)gPad->GetPadSave();
-    pad->Range(fZoomX0[fZooms],fZoomY0[fZooms], fZoomX1[fZooms],fZoomY1[fZooms]);
-    pad->Modified();
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::ResetPoints()
-{
-    //
-    // Reset array of points
-    //
-    if (fPoints) {
-       fPoints->Delete();
-       delete fPoints;
-       fPoints = 0;
-  }
-}
-//_____________________________________________________________________________
-void AliRICHDisplay::ResetRpoints()
-{
-  //
-  // Reset array of points
-  //
-  if (fRpoints) {
-    fRpoints->Delete();
-    delete fRpoints;
-    fRpoints = 0;
-  }
-}
-//_____________________________________________________________________________
-void AliRICHDisplay::ResetRecpoints()
-{
-  //
-  // Reset array of points
-  //
-  if (fRecpoints) {
-    fRecpoints->Delete();
-    delete fRecpoints;
-    fRecpoints = 0;
-  }
-}
-//_____________________________________________________________________________
-void AliRICHDisplay::ResetPhits()
-{
-    //
-    // Reset array of points
-    //
-    if (fPhits) {
-       fPhits->Delete();
-       delete fPhits;
-       fPhits = 0;
-    }
-}
-//_____________________________________________________________________________
-void AliRICHDisplay::ResetPCerenkovs()
-{
-    //
-    // Reset array of points
-    //
-    if (fPCerenkovs) {
-       fPCerenkovs->Delete();
-       delete fPCerenkovs;
-       fPCerenkovs = 0;
-    }
-}
-
-//_____________________________________________________________________________
-
-void AliRICHDisplay::DrawViewGL()
-{
-//    Draw current view using OPENGL
-
-   TPad *pad = (TPad*)gPad->GetPadSave();
-   pad->cd();
-   TView *view = pad->GetView();
-   if (!view) return;
-   pad->x3d("OPENGL");
-}
-
-//_____________________________________________________________________________
-void AliRICHDisplay::DrawViewX3D()
-{
-//    Draw current view using X3D
-
-   TPad *pad = (TPad*)gPad->GetPadSave();
-   pad->cd();
-   TView *view = pad->GetView();
-   if (!view) return;
-   pad->x3d();
-}
diff --git a/RICH/AliRICHDisplay.h b/RICH/AliRICHDisplay.h
deleted file mode 100644 (file)
index 8bfa00b..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef ALIRICHDISPLAY_H
-#define ALIRICHDISPLAY_H
-
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-//////////////////////////////////////////////////////////////////////////
-//                                                                      //
-// AliDisplay                                                           //
-//                                                                      //
-// Utility class to display ALice outline, tracks, hits,..              //
-//                                                                      //
-//////////////////////////////////////////////////////////////////////////
-
-//#ifndef ROOT_TObject
-#include <TPolyMarker3D.h>
-#include <TAttLine.h>
-#include <TAtt3D.h>
-
-//#endif
-#include "AliDisplay.h"
-
-
-class TCanvas;
-class TPad;
-class TList;
-class TSlider;
-class TButton;
-class TArc;
-
-class AliRICHEllipse;
-
-const Int_t kMAXZOOM = 20;
-
-class AliRICHDisplay : public AliDisplay {
- public:
-    AliRICHDisplay();
-    AliRICHDisplay(Int_t size);
-    virtual          ~AliRICHDisplay();
-    virtual void      Clear(Option_t *option="");
-    virtual void      DisplayButtons();
-    virtual void      CreateColors();
-    virtual void      DisplayColorScale();
-    virtual Int_t     DistancetoPrimitive(Int_t px, Int_t py);
-    virtual void      Draw(Option_t *option="");
-    virtual void      DrawCoG();
-    virtual void      DrawRecHits();
-    virtual void      DrawCerenkovs();
-    virtual void      DrawClusters();
-    virtual void      DrawHits();
-    virtual void      DrawTitle(Option_t *option="");
-    virtual void      DrawView(Float_t theta, Float_t phi, Float_t psi=0);
-    virtual void      DrawViewGL();
-    virtual void      DrawViewX3D();
-    virtual void      ExecuteEvent(Int_t event, Int_t px, Int_t py);
-    Int_t             GetZoomMode() {return fZoomMode;}
-    Int_t             GetChamber() {return fChamber;}
-    Int_t             GetCathode() {return fCathode;}
-    virtual void      LoadDigits();
-    virtual void      LoadRecHits(Int_t chamber, Int_t cathode);
-    virtual void      LoadCoG(Int_t chamber, Int_t cathode);
-    virtual void      LoadCerenkovs(Int_t chamber);
-    virtual void      LoadHits(Int_t chamber);
-    TPad             *Pad() {return fPad;}
-    TObjArray        *Points() {return fPoints;}
-    TObjArray        *Phits() {return fPhits;}
-    TObjArray        *Rpoints() {return fRpoints;}
-    TObjArray        *PCerenkovs() {return fPCerenkovs;}
-    virtual void      Paint(Option_t *option="");
-    virtual void      SetDrawClusters(Bool_t draw=kTRUE) {fDrawClusters=draw;}   // *MENU*
-    virtual void      SetDrawCoG(Bool_t draw=kTRUE) {fDrawCoG=draw;}   // *MENU*
-    virtual void      SetChamberAndCathode(Int_t chamber=1, Int_t cathode=1); // *MENU*
-    virtual void      SetRange(Float_t rrange=250, Float_t zrange=1050); // *MENU*
-    virtual void      SetView(Float_t theta, Float_t phi, Float_t psi=0);
-    virtual void      SetPickMode();
-    virtual void      SetZoomMode();
-    virtual void      ShowNextEvent(Int_t delta=1);
-    virtual void      UnZoom(); // *MENU*
-    virtual void      ResetPoints();
-    virtual void      ResetRpoints();
-    virtual void      ResetRecpoints();
-    virtual void      ResetPhits();
-    virtual void      ResetPCerenkovs();
- private:
-    Int_t             fChamber;              //Chamber number
-    Int_t             fCathode;              //Cathode number
-    Bool_t            fDrawClusters;         //Flag True if Clusters to be drawn
-    Bool_t            fDrawCoG;              //Flag True if CoG to be drawn
-    Bool_t            fDrawRecHits;          //Flag True if rec hits to be drawn
-    Float_t           fTheta;                //Viewing angle theta
-    Float_t           fPhi;                  //Viewing angle phi
-    Int_t             fClustersCuts;         //Number of clusters surviving cuts
-    TPad             *fColPad;               //Pointer to the colors pad 
-    TObjArray        *fPoints;               //Array of points for each cathode
-    TObjArray        *fPhits;                //Array of hit points for each chamber
-    TObjArray        *fPCerenkovs;           //Array of cerenkov hits for each chamber
-    TObjArray        *fRpoints;              //Array of cog points for each cathode 
-    TObjArray        *fRecpoints;            //Array of rec points for each cathode 
-    ClassDef(AliRICHDisplay, 0)   //Utility class to display RICH clusters...
-       
-};
-#endif
-       
diff --git a/RICH/AliRICHPoints.cxx b/RICH/AliRICHPoints.cxx
deleted file mode 100644 (file)
index 1553bca..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//  This class contains the points for the ALICE event display               //
-//                                                                           //
-//Begin_Html
-/*
-<img src="gif/AliRICHPointsClass.gif">
-*/
-//End_Html
-//                                                                           //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-#include "AliRICHPoints.h"
-#include "AliRICHDisplay.h"
-#include "AliRICHChamber.h"
-#include "AliRICH.h"
-#include <TPad.h>
-#include <TTree.h>
-#include <TView.h>
-#include <TMath.h>
-#include <TPolyMarker3D.h>
-#include <TMarker3DBox.h>
-#include <TParticle.h>
-#include <AliRun.h>
-#include <AliMC.h>
-#include <TRotMatrix.h>
-
-const Int_t kMaxNipx=400, kMaxNipy=800;
-ClassImp(AliRICHPoints)
-
-//_____________________________________________________________________________
-AliRICHPoints::AliRICHPoints()
-{
-  //
-  // Default constructor
-  //
-  fHitIndex = 0;
-  fTrackIndex = 0;
-  fDigitIndex = 0;
-  fMarker[0] = fMarker[1] = fMarker[2]=0;
-}
-
-//_____________________________________________________________________________
-AliRICHPoints::AliRICHPoints(Int_t npoints)
-  :AliPoints(npoints)
-{
-  //
-  // Standard constructor
-  //
-  fHitIndex = 0;
-  fTrackIndex = 0;
-  fDigitIndex = 0;
-  fMarker[0] = fMarker[1] = fMarker[2]=0;
-}
-        
-//_____________________________________________________________________________
-AliRICHPoints::~AliRICHPoints()
-{
-  //
-  // Default destructor
-  //
-  fHitIndex = 0;
-  fTrackIndex = 0;
-  fDigitIndex = 0;
-}
-
-//_____________________________________________________________________________
-void AliRICHPoints::DumpHit()
-{
-  //
-  //   Dump hit corresponding to this point
-  //
-  AliRICHhit *hit = GetHit();
-  if (hit) hit->Dump();
-}
-
-//_____________________________________________________________________________
-void AliRICHPoints::DumpDigit()
-{
-  //
-  //   Dump digit corresponding to this point
-  //
-  AliRICHdigit *digit = GetDigit();
-  if (digit) digit->Dump();
-}
-
-//_____________________________________________________________________________
-void AliRICHPoints::InspectHit()
-{
-  //
-  //   Inspect hit corresponding to this point
-  //
-  AliRICHhit *hit = GetHit();
-  if (hit) hit->Inspect();
-}
-
-//_____________________________________________________________________________
-void AliRICHPoints::InspectDigit()
-{
-  //
-  //   Inspect digit corresponding to this point
-  //
-  AliRICHdigit *digit = GetDigit();
-  if (digit) digit->Inspect();
-}
-
-//_____________________________________________________________________________
-Int_t AliRICHPoints::GetTrackIndex()
-{
-  //
-  //   Dump digit corresponding to this point
-  //
-  printf("GetTrackIndex - fTrackIndex %d \n",fTrackIndex);
-  this->Inspect();
-  return fTrackIndex;
-}
-//_____________________________________________________________________________
-TParticle *AliRICHPoints::GetParticle() const
-{
-  //
-  //   Returns pointer to particle index in AliRun::fParticles
-  //
-  if (fIndex < 0 || fIndex >= gAlice->GetMCApp()->GetNtrack()) return 0;
-  return gAlice->GetMCApp()->Particle(fIndex);
-}
-
-//_____________________________________________________________________________
-AliRICHhit *AliRICHPoints::GetHit() const
-{
-  //
-  //   Returns pointer to hit index in AliRun::fParticles
-  //
-  AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
-  pRICH->TreeH()->GetEvent(fTrackIndex);
-  TClonesArray *pRICHhits  = pRICH->Hits();
-  Int_t nhits = pRICHhits->GetEntriesFast();
-  if (fHitIndex < 0 || fHitIndex >= nhits) return 0;
-  return (AliRICHhit*)pRICHhits->UncheckedAt(fHitIndex);
-}
-
-//_____________________________________________________________________________
-AliRICHdigit *AliRICHPoints::GetDigit() const
-{
-  //
-  //   Returns pointer to digit index in AliRun::fParticles
-  //
-
-  AliRICHDisplay *display=(AliRICHDisplay*)gAlice->Display();
-  Int_t chamber=display->GetChamber();
-  Int_t cathode=display->GetCathode();
-   
-  AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
-  TClonesArray *pRICHdigits  = pRICH->Digits(chamber);
-  gAlice->TreeD()->GetEvent(cathode);
-  Int_t ndigits = pRICHdigits->GetEntriesFast();
-  if (fDigitIndex < 0 || fDigitIndex >= ndigits) return 0;
-  return (AliRICHdigit*)pRICHdigits->UncheckedAt(fDigitIndex);
-}
-//----------------------------------------------------------------------------
-void AliRICHPoints::ShowRing(Int_t highlight)
-{
-
-//
-// Highlights all pads generated by the same mother particle
-
-  highlight++;   
-  
-
-}
-
-//_____________________________________________________________________________
-const Text_t *AliRICHPoints::GetName() const
-{
-  //
-  // Return name of the Geant3 particle corresponding to this point
-  //
-  TParticle *particle = GetParticle();
-  if (!particle) return "Particle";
-  return particle->GetName();
-}
-
-//_____________________________________________________________________________
-Text_t *AliRICHPoints::GetObjectInfo(Int_t, Int_t)
-{
-  //
-  //   Redefines TObject::GetObjectInfo.
-  //   Displays the info (particle,etc
-  //   corresponding to cursor position px,py
-  //
-  static char info[64];
-  sprintf(info,"%s %d",GetName(),fIndex);
-  return info;
-}
-
-
-
diff --git a/RICH/AliRICHPoints.h b/RICH/AliRICHPoints.h
deleted file mode 100644 (file)
index cfe4baf..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef ALIRICHPOINTS_H
-#define ALIRICHPOINTS_H
-
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-#include <TPolyMarker3D.h>
-#include <TMarker3DBox.h>
-#include "AliRICH.h"
-#include "AliPoints.h"
-
-class AliRICHPoints : public AliPoints {
-public:
-  AliRICHPoints();
-  AliRICHPoints(Int_t npoints);
-  virtual ~AliRICHPoints();
-
-  Int_t                 GetHitIndex() {return fHitIndex;}
-  Int_t                 GetTrackIndex(); // *MENU*
-  Int_t                 GetDigitIndex() {return fDigitIndex;}
-  Int_t                 GetIndex() {return fIndex;}
-  AliRICHhit           *GetHit() const;
-  AliRICHdigit         *GetDigit() const;
-  virtual const Text_t *GetName() const;
-  virtual Text_t       *GetObjectInfo(Int_t px, Int_t py);
-  TMarker3DBox         *GetMarker(Int_t i) {return fMarker[i];}
-  TParticle            *GetParticle() const;
-  virtual void          InspectHit(); // *MENU*
-  virtual void          DumpHit(); // *MENU*
-  virtual void          InspectDigit(); // *MENU*
-  virtual void          DumpDigit(); // *MENU*
-  virtual void          ShowRing(Int_t highlight); // *MENU*
-  virtual void          SetHitIndex(Int_t hitindex) {fHitIndex = hitindex;}
-  virtual void          SetTrackIndex(Int_t trackindex) {fTrackIndex = trackindex;}
-  virtual void          SetDigitIndex(Int_t digitindex) {fDigitIndex = digitindex;}
-  virtual void          Set3DMarker(Int_t i,TMarker3DBox *marker) {fMarker[i] = marker;}  
-  virtual void          SetParticle(Int_t index) {fIndex = index;}
- protected:
-  Int_t            fHitIndex;         // Link to hit number 
-  Int_t            fTrackIndex;       // Link to track number 
-  Int_t            fDigitIndex;       // Link to digit 
-  TMarker3DBox     *fMarker[3];       // pointer to  associated 3D-marker
-
-  ClassDef(AliRICHPoints,1) //Class to draw detector clusters (is PolyMarker3D)
-};
-#endif
-
-
-
-
-
-
index 12ee6f0e539ed6c8c8c523e4f18c704d1b9013ab..4768f4892aab6b5e0c21442c228f47984cfc02af 100644 (file)
@@ -11,8 +11,6 @@
 #pragma link C++ class  AliRICHcluster+;
 #pragma link C++ class  AliRICHreco+;
 #pragma link C++ class  AliRICHChamber+;
-#pragma link C++ class  AliRICHPoints+;
-#pragma link C++ class  AliRICHDisplay+;
 #pragma link C++ class  AliRICHMap+;
 #pragma link C++ class  AliRICHClusterFinder+;
 #pragma link C++ class  AliRICHRecon+;
index 305f020f3e10c9f745cb770d379e628fbe457fd5..b3a7f3460f4888bf153faed1f692027613f150cc 100644 (file)
@@ -1,5 +1,5 @@
 SRCS   =  AliRICH.cxx AliRICHv0.cxx AliRICHv1.cxx\
-        AliRICHParam.cxx AliRICHDisplay.cxx AliRICHPoints.cxx\
+        AliRICHParam.cxx \
         AliRICHClusterFinder.cxx AliRICHMap.cxx\
         AliRICHChamber.cxx AliRICHRecon.cxx\
          AliRICHDisplFast.cxx\