Modifications needed by the HBT analysis (P.Skowronski)

[u/mrichter/AliRoot.git] / MUON / AliMUONPoints.cxx

diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx
index 25a764f0248b1777a3c5a9626dfbf055ed49f8f1..157bc3a3ebcc14b64898c4501e7e4b4f02eb2ab9 100644 (file)
--- a/MUON/AliMUONPoints.cxx
+++ b/MUON/AliMUONPoints.cxx
@@ -12,30 +12,8 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/*
-$Log$
-Revision 1.5  2000/10/02 21:28:09  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.4  2000/07/03 11:54:57  morsch
-AliMUONSegmentation and AliMUONHitMap have been replaced by AliSegmentation and AliHitMap in STEER
-The methods GetPadIxy and GetPadXxy of AliMUONSegmentation have changed name to GetPadI and GetPadC.
-
-Revision 1.3  2000/06/27 10:13:01  morsch
-Obsolete global variables removed from file.
-
-Revision 1.2  2000/06/15 07:58:48  morsch
-Code from MUON-dev joined
 
-Revision 1.1.2.6  2000/06/09 21:57:40  morsch
-Most coding rule violations corrected.
-
-Revision 1.1.2.5  2000/05/05 11:33:56  morsch
-Log inside comments.
-
-Revision 1.1.2.4  2000/05/05 10:12:09  morsch
-Log messages included
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -103,7 +81,7 @@ AliMUONPoints::AliMUONPoints(Int_t npoints)
   fMatrix = 0;
 }
 
-AliMUONPoints::AliMUONPoints(const AliMUONPoints& points)
+AliMUONPoints::AliMUONPoints(const AliMUONPoints& points):AliPoints(points)
 {
 // Copy constructor
 }
@@ -201,8 +179,9 @@ void AliMUONPoints::InspectDigit()
       //      sprintf(ptitle[11],"Tracks making this digit");
       //      pad->AddText(ptitle[11]);
   for (int i=0;i<10;i++) {
-      if (digit->fTracks[i] == 0) continue;  
-      sprintf(ptitle[i],"fTrackIndex: %d  Charge: %d",digit->fTracks[i],digit->fTcharges[i]);
+      if (digit->Track(i) == 0) continue;  
+      sprintf(ptitle[i],"fTrackIndex: %d  Charge: %d",
+             digit->Track(i), digit->TrackCharge(i));
       pad->AddText(ptitle[i]);
   }
       padinspect->cd();
@@ -237,7 +216,8 @@ AliMUONHit *AliMUONPoints::GetHit() const
   //   Returns pointer to hit index in AliRun::fParticles
   //
   AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
-  gAlice->TreeH()->GetEvent(fTrackIndex);
+  
+  pMUON->TreeH()->GetEvent(fTrackIndex);
   TClonesArray *muonHits  = pMUON->Hits();
   Int_t nhits = muonHits->GetEntriesFast();
   if (fHitIndex < 0 || fHitIndex >= nhits) return 0;
@@ -256,9 +236,9 @@ AliMUONDigit *AliMUONPoints::GetDigit() const
   Int_t cathode=display->GetCathode();
    
   AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
-  TClonesArray *muonDigits  = pMUON->DigitsAddress(chamber-1);
+  TClonesArray *muonDigits  = pMUON->GetMUONData()->Digits(chamber-1);
   Int_t nent=(Int_t)gAlice->TreeD()->GetEntries();
-  gAlice->TreeD()->GetEvent(nent-2+cathode-1);
+  pMUON->GetMUONData()->GetCathode(nent-2+cathode-1);
   //gAlice->TreeD()->GetEvent(cathode);
   Int_t ndigits = muonDigits->GetEntriesFast();
   if (fDigitIndex < 0 || fDigitIndex >= ndigits) return 0;
@@ -266,7 +246,7 @@ AliMUONDigit *AliMUONPoints::GetDigit() const
 }
 //_____________________________________________________________________________
 
-AliMUONPoints& AliMUONPoints::operator= (const AliMUONPoints& rhs)
+AliMUONPoints& AliMUONPoints::operator= (const AliMUONPoints& /*rhs*/)
 {
     return *this;
 }