Introduced new DE names unique to each det element;

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

diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx
index 6ff6ab14f426ea0c4bf16e65551b95f676c27b74..79b73b57bbf3b8faaecf6157c3e581af165f0801 100644 (file)
--- a/MUON/AliMUONPoints.cxx
+++ b/MUON/AliMUONPoints.cxx
@@ -30,7 +30,6 @@
 
 #include <TROOT.h>
 #include <TPolyMarker3D.h>
-#include <TMatrix.h>
 #include <TVirtualPad.h>
 #include <TPaveText.h>
 #include <TMarker3DBox.h>
@@ -43,51 +42,42 @@
 #include "AliMUONDigit.h"
 #include "AliLog.h"
 
+/// \cond CLASSIMP
 ClassImp(AliMUONPoints)
+/// \endcond
 
 //_____________________________________________________________________________
 AliMUONPoints::AliMUONPoints()
-  : AliPoints()
+  : AliPoints(),
+    fHitIndex(0),
+    fTrackIndex(0),
+    fDigitIndex(0),
+    fMatrix(0)
+
 {
-  //
-  // Default constructor
-  //
-  fHitIndex = 0;
-  fTrackIndex = 0;
-  fDigitIndex = 0;
+  /// Default constructor
+
   fMarker[0] = fMarker[1] = fMarker[2]=0;
-  fMatrix = 0;
 }
 
 //_____________________________________________________________________________
 AliMUONPoints::AliMUONPoints(Int_t npoints)
-  :AliPoints(npoints)
+  : AliPoints(npoints),
+    fHitIndex(0),
+    fTrackIndex(0),
+    fDigitIndex(0),
+    fMatrix(0)
 {
-  //
-  // Standard constructor
-  //
-  fHitIndex = 0;
-  fTrackIndex = 0;
-  fDigitIndex = 0;
+  /// Standard constructor
+
   fMarker[0] = fMarker[1] = fMarker[2]=0;
-  fMatrix = 0;
 }
 
-//_____________________________________________________________________________
-AliMUONPoints::AliMUONPoints(const AliMUONPoints& points)
-  : AliPoints(points)
-{
-// Protected copy constructor
-
-  AliFatal("Not implemented.");
-}
-        
 //_____________________________________________________________________________
 AliMUONPoints::~AliMUONPoints()
 {
-  //
-  // Default destructor
-  //
+  /// Destructor
+
   fHitIndex = 0;
   fTrackIndex = 0;
   fDigitIndex = 0;
@@ -100,9 +90,8 @@ AliMUONPoints::~AliMUONPoints()
 //_____________________________________________________________________________
 void AliMUONPoints::DumpHit() const
 {
-  //
-  //   Dump hit corresponding to this point
-  //
+  /// Dump hit corresponding to this point
+ 
   AliMUONHit *hit = GetHit();
   if (hit) hit->Dump();
 }
@@ -110,9 +99,8 @@ void AliMUONPoints::DumpHit() const
 //_____________________________________________________________________________
 void AliMUONPoints::DumpDigit() const
 {
-  //
-  //   Dump digit corresponding to this point
-  //
+  /// Dump digit corresponding to this point
+
   AliMUONDigit *digit = GetDigit();
   if (digit) digit->Dump();
 }
@@ -120,9 +108,7 @@ void AliMUONPoints::DumpDigit() const
 //_____________________________________________________________________________
 void AliMUONPoints::InspectHit()
 {
-  //
-  //   Inspect hit corresponding to this point
-  //
+  /// Inspect hit corresponding to this point
 
   if (fHitIndex < 0 ) return;
   TVirtualPad *padsav = gPad;
@@ -152,9 +138,8 @@ void AliMUONPoints::InspectHit()
 //_____________________________________________________________________________
 void AliMUONPoints::InspectDigit()
 {
-  //
-  //   Inspect digit corresponding to this point
-  //
+  /// Inspect digit corresponding to this point
+
   if (fDigitIndex < 0) return;
   TVirtualPad *padsav = gPad;
   AliMUONDigit *digit = GetDigit();
@@ -174,9 +159,9 @@ void AliMUONPoints::InspectDigit()
       char ptitle[11][100];
       //      sprintf(ptitle[11],"Tracks making this digit");
       //      pad->AddText(ptitle[11]);
-  for (int i=0;i<10;i++) {
+  for (int i=0;i<digit->Ntracks();i++) {
       if (digit->Track(i) == 0) continue;  
-      sprintf(ptitle[i],"fTrackIndex: %d  Charge: %d",
+      sprintf(ptitle[i],"fTrackIndex: %d  Charge: %e",
              digit->Track(i), digit->TrackCharge(i));
       pad->AddText(ptitle[i]);
   }
@@ -189,9 +174,7 @@ void AliMUONPoints::InspectDigit()
 //_____________________________________________________________________________
 Int_t AliMUONPoints::GetTrackIndex() const
 {
-  //
-  //   Dump digit corresponding to this point
-  //
+  /// Dump digit corresponding to this point
 
   Inspect();
   /*
@@ -208,9 +191,8 @@ Int_t AliMUONPoints::GetTrackIndex() const
 //_____________________________________________________________________________
 AliMUONHit *AliMUONPoints::GetHit() const
 {
-  //
-  //   Returns pointer to hit index in AliRun::fParticles
-  //
+  /// Returns pointer to hit index in AliRun::fParticles
+
   AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
   
   pMUON->TreeH()->GetEvent(fTrackIndex);
@@ -223,32 +205,16 @@ AliMUONHit *AliMUONPoints::GetHit() const
 //_____________________________________________________________________________
 AliMUONDigit *AliMUONPoints::GetDigit() const
 {
-  //
-  //   Returns pointer to digit index in AliRun::fParticles
-  //
+  /// Returns pointer to digit index in AliRun::fParticles
 
   AliMUONDisplay *display=(AliMUONDisplay*)gAlice->Display();
   Int_t chamber=display->GetChamber();
-  Int_t cathode=display->GetCathode();
    
   AliMUON *pMUON  = (AliMUON*)gAlice->GetModule("MUON");
   TClonesArray *muonDigits  = pMUON->GetMUONData()->Digits(chamber-1);
-  Int_t nent=(Int_t)gAlice->TreeD()->GetEntries();
-  pMUON->GetMUONData()->GetCathode(nent-2+cathode-1);
+  pMUON->GetMUONData()->GetDigits();
   //gAlice->TreeD()->GetEvent(cathode);
   Int_t ndigits = muonDigits->GetEntriesFast();
   if (fDigitIndex < 0 || fDigitIndex >= ndigits) return 0;
   return (AliMUONDigit*)muonDigits->UncheckedAt(fDigitIndex);
 }
-//_____________________________________________________________________________
-
-AliMUONPoints& AliMUONPoints::operator= (const AliMUONPoints& rhs)
-{
-// Protected assignement operator
-
-  if (this == &rhs) return *this;
-
-  AliFatal("Not implemented.");
-    
-  return *this;  
-}