Fix bug on getter methods (Indranil)

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

diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx
index 28022d57f054b8972dfeef7af18c24824f0808f8..a12a4d5fb494a24ae4b7ccb64b39f1f7523bdea6 100644 (file)
--- a/MUON/AliMUONPoints.cxx
+++ b/MUON/AliMUONPoints.cxx
@@ -12,33 +12,8 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-/*
-$Log$
-Revision 1.6  2000/10/03 13:51:57  egangler
-Removal of useless dependencies via forward declarations
-
-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$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -53,34 +28,26 @@ Log messages included
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliMUONPoints.h"
-#include "AliMUONDisplay.h"
-#include "AliRun.h"
-#include "AliMUON.h"
-#include "AliMUONChamber.h"
-#include "AliMUONResponse.h"
-#include "AliMUONHit.h"
-#include "AliMUONPadHit.h"
-#include "AliMUONDigit.h"
-#include "AliMUONRawCluster.h"
-
-
 #include <TROOT.h>
-#include <TTree.h>
 #include <TPolyMarker3D.h>
 #include <TMatrix.h>
-#include <TPad.h>
 #include <TVirtualPad.h>
-#include <TPolyLine3D.h>
 #include <TPaveText.h>
-#include <TView.h>
-#include <TMath.h>
 #include <TMarker3DBox.h>
  
+#include "AliMUONPoints.h"
+#include "AliMUONDisplay.h"
+#include "AliRun.h"
+#include "AliMUON.h"
+#include "AliMUONHit.h"
+#include "AliMUONDigit.h"
+#include "AliLog.h"
+
 ClassImp(AliMUONPoints)
 
 //_____________________________________________________________________________
 AliMUONPoints::AliMUONPoints()
+  : AliPoints()
 {
   //
   // Default constructor
@@ -106,9 +73,13 @@ AliMUONPoints::AliMUONPoints(Int_t npoints)
   fMatrix = 0;
 }
 
+//_____________________________________________________________________________
 AliMUONPoints::AliMUONPoints(const AliMUONPoints& points)
+  : AliPoints(points)
 {
-// Copy constructor
+// Protected copy constructor
+
+  AliFatal("Not implemented.");
 }
         
 //_____________________________________________________________________________
@@ -127,7 +98,7 @@ AliMUONPoints::~AliMUONPoints()
 }
 
 //_____________________________________________________________________________
-void AliMUONPoints::DumpHit()
+void AliMUONPoints::DumpHit() const
 {
   //
   //   Dump hit corresponding to this point
@@ -137,7 +108,7 @@ void AliMUONPoints::DumpHit()
 }
 
 //_____________________________________________________________________________
-void AliMUONPoints::DumpDigit()
+void AliMUONPoints::DumpDigit() const
 {
   //
   //   Dump digit corresponding to this point
@@ -216,13 +187,13 @@ void AliMUONPoints::InspectDigit()
 }
 
 //_____________________________________________________________________________
-Int_t AliMUONPoints::GetTrackIndex()
+Int_t AliMUONPoints::GetTrackIndex() const
 {
   //
   //   Dump digit corresponding to this point
   //
 
-  this->Inspect();
+  Inspect();
   /*
   if (fDigitIndex != 0) {
     Int_t ncol=this->fMatrix->GetNcols();
@@ -241,7 +212,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;
@@ -257,12 +229,10 @@ AliMUONDigit *AliMUONPoints::GetDigit() const
 
   AliMUONDisplay *display=(AliMUONDisplay*)gAlice->Display();
   Int_t chamber=display->GetChamber();
-  Int_t cathode=display->GetCathode();
    
   AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
-  TClonesArray *muonDigits  = pMUON->DigitsAddress(chamber-1);
-  Int_t nent=(Int_t)gAlice->TreeD()->GetEntries();
-  gAlice->TreeD()->GetEvent(nent-2+cathode-1);
+  TClonesArray *muonDigits  = pMUON->GetMUONData()->Digits(chamber-1);
+  pMUON->GetMUONData()->GetDigits();
   //gAlice->TreeD()->GetEvent(cathode);
   Int_t ndigits = muonDigits->GetEntriesFast();
   if (fDigitIndex < 0 || fDigitIndex >= ndigits) return 0;
@@ -272,5 +242,11 @@ AliMUONDigit *AliMUONPoints::GetDigit() const
 
 AliMUONPoints& AliMUONPoints::operator= (const AliMUONPoints& rhs)
 {
-    return *this;
+// Protected assignement operator
+
+  if (this == &rhs) return *this;
+
+  AliFatal("Not implemented.");
+    
+  return *this;  
 }