Transition to NewIO

[u/mrichter/AliRoot.git] / RICH / AliRICHDisplay.cxx

diff --git a/RICH/AliRICHDisplay.cxx b/RICH/AliRICHDisplay.cxx
index d33fab2804408fd880839c1ab4e49bfef212cb70..491d1ada03412f7813fcfba2e2f8c524e5e6c8c9 100644 (file)
--- a/RICH/AliRICHDisplay.cxx
+++ b/RICH/AliRICHDisplay.cxx
@@ -13,66 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-  $Log$
-  Revision 1.19  2002/11/04 08:59:20  morsch
-  Correct orientation of modules. (J. Barbosa)
-
-  Revision 1.18  2002/10/29 14:24:19  morsch
-  Minor corrections on the display (adc counts readable, ...).
-  (J. Barbosa)
-
-  Revision 1.17  2001/10/23 13:03:35  hristov
-  The access to several data members was changed from public to protected. The digitisation was adapted to the multi-event case (J.Chudoba)
-
-  Revision 1.16  2001/10/21 18:31:24  hristov
-  Several pointers were set to zero in the default constructors to avoid memory management problems
-
-  Revision 1.15  2001/10/09 07:34:09  hristov
-  Modifications needed by Root.03.01.06 (J.Chudoba)
-
-  Revision 1.14  2001/05/16 14:57:20  alibrary
-  New files for folders and Stack
-
-  Revision 1.13  2001/05/10 12:35:16  jbarbosa
-  Removed hit display, added rec. ring properties.
-
-  Revision 1.12  2001/03/14 18:15:03  jbarbosa
-  Changes to adapt to new IO.
-  Removed verbose output.
-
-  Revision 1.11  2001/02/27 15:21:34  jbarbosa
-  Transition to SDigits.
-
-  Revision 1.10  2001/02/13 20:18:48  jbarbosa
-  Corrected some more positioning of points. Changes in LoadDigits to accomodate the new IO.
-
-  Revision 1.9  2000/11/01 15:33:11  jbarbosa
-  Updated to handle both reconstruction algorithms.
-
-  Revision 1.8  2000/10/03 21:44:09  morsch
-  Use AliSegmentation and AliHit abstract base classes.
-
-  Revision 1.7  2000/10/02 21:28:12  fca
-  Removal of useless dependecies via forward declarations
-
-  Revision 1.6  2000/10/02 15:46:38  jbarbosa
-  Fixed forward declarations.
-
-  Revision 1.5  2000/06/30 16:49:34  dibari
-  Different call for ring drawing.
-
-  Revision 1.4  2000/06/12 15:21:08  jbarbosa
-  Cleaned up version.
-
-  Revision 1.3  2000/06/09 14:52:08  jbarbosa
-  New tentative ellipse drawing routine
-
-  Revision 1.1  2000/04/19 13:07:45  morsch
-  Digits, clusters and reconstruction results added.
-
-*/
-
+/* $Id$ */
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
@@ -1080,7 +1021,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber)
     AliRICHChamber*  iChamber;
     
     iChamber = &(pRICH->Chamber(chamber-1));
-    Int_t ntracks = (Int_t)gAlice->TreeH()->GetEntries();
+    Int_t ntracks = (Int_t)pRICH->TreeH()->GetEntries();
     Int_t track;
     
     if (fPhits == 0) fPhits = new TObjArray(ntracks);
@@ -1092,7 +1033,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber)
     Int_t nAllHits=0;
     for (track=0; track<ntracks;track++) {
        gAlice->ResetHits();
-       gAlice->TreeH()->GetEvent(track);
+       pRICH->TreeH()->GetEvent(track);
        TClonesArray *pRICHhits  = pRICH->Hits();
        if (pRICHhits == 0) return;
        Int_t nhits = pRICHhits->GetEntriesFast();
@@ -1104,7 +1045,7 @@ void AliRICHDisplay::LoadHits(Int_t chamber)
     Int_t npoints=0;
     for (track=0; track<ntracks;track++) {
        gAlice->ResetHits();
-       gAlice->TreeH()->GetEvent(track);
+       pRICH->TreeH()->GetEvent(track);
        TClonesArray *pRICHhits  = pRICH->Hits();
        if (pRICHhits == 0) return;
        Int_t nhits = pRICHhits->GetEntriesFast();
@@ -1151,7 +1092,7 @@ void AliRICHDisplay::LoadCerenkovs(Int_t chamber)
     iChamber = &(pRICH->Chamber(chamber-1));
     
     pRICH->SetTreeAddress();
-    Int_t ntracks = (Int_t)gAlice->TreeH()->GetEntries();
+    Int_t ntracks = (Int_t)pRICH->TreeH()->GetEntries();
     
     if (fPCerenkovs == 0) fPCerenkovs = new TObjArray(ntracks);
     TVector *xp = new TVector(1000);
@@ -1161,7 +1102,7 @@ void AliRICHDisplay::LoadCerenkovs(Int_t chamber)
     TVector *phit = new TVector(1000);
     for (Int_t track=0; track<ntracks;track++) {
        gAlice->ResetHits();
-       gAlice->TreeH()->GetEvent(track);
+       pRICH->TreeH()->GetEvent(track);
        TClonesArray *pRICHCerenkovs  = pRICH->Cerenkovs();
        if (pRICHCerenkovs == 0) return;
        Int_t nhits = pRICHCerenkovs->GetEntriesFast();