All data members private. Access functions provided.

diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx
index 2e2cbedc55daaac5d213f47b4eb4b813f1a62558..7f2ee3cc4572f101667a59068b1a3591f2a97017 100644 (file)
--- a/MUON/AliMUONDigit.cxx
+++ b/MUON/AliMUONDigit.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  2000/06/15 07:58:48  morsch
+Code from MUON-dev joined
+
 Revision 1.1.2.1  2000/06/09 22:03:22  morsch
 Was before in DataStructures.cxx
 
@@ -31,9 +34,10 @@ AliMUONDigit::AliMUONDigit(Int_t *digits)
   //
     fPadX        = digits[0];
     fPadY        = digits[1];
-    fSignal      = digits[2];
-    fPhysics     = digits[3];
-    fHit         = digits[4];
+    fCathode     = digits[2];
+    fSignal      = digits[3];
+    fPhysics     = digits[4];
+    fHit         = digits[5];
 
 }
 //_____________________________________________________________________________
@@ -44,9 +48,11 @@ AliMUONDigit::AliMUONDigit(Int_t *tracks, Int_t *charges, Int_t *digits)
     //
     fPadX        = digits[0];
     fPadY        = digits[1];
-    fSignal      = digits[2];
-    fPhysics     = digits[3];
-    fHit       = digits[4];
+    fCathode     = digits[2];
+    fSignal      = digits[3];
+    fPhysics     = digits[4];
+    fHit         = digits[5];
+
     for(Int_t i=0; i<10; i++) {
        fTcharges[i]  = charges[i];
        fTracks[i]    = tracks[i];

diff --git a/MUON/AliMUONDigit.h b/MUON/AliMUONDigit.h
index 4cc14fe4a7acaf442d434ad30e73d28047589b6c..30a450b3ea5008969fe8ff5651025756d844d3c1 100644 (file)
--- a/MUON/AliMUONDigit.h
+++ b/MUON/AliMUONDigit.h
@@ -8,19 +8,34 @@
 #include <TObject.h>
 
 class AliMUONDigit : public TObject {
+
  public:
+    AliMUONDigit() {}
+    AliMUONDigit(Int_t *digits);
+    AliMUONDigit(Int_t *tracks, Int_t *charges, Int_t *digits);
+    virtual ~AliMUONDigit();
+    
+    virtual Int_t    PadX()               {return fPadX;}
+    virtual Int_t    PadY()               {return fPadY;}
+    virtual Int_t    Signal()             {return fSignal;}
+    virtual Int_t    Physics()            {return fPhysics;}
+    virtual Int_t    Hit()                {return fHit;}    
+    virtual Int_t    Cathode()            {return fCathode;}
+    virtual Int_t    Track(Int_t i)       {return fTracks[i];}
+    virtual Int_t    TrackCharge(Int_t i) {return fTcharges[i];}    
+    virtual void     AddSignal(Int_t q)   {fSignal += q;}
+    virtual void     AddPhysicsSignal(Int_t q)   {fPhysics += q;}          
+ private:
     Int_t     fPadX;          // Pad number along x
-    Int_t     fPadY ;         // Pad number along y
+    Int_t     fPadY;          // Pad number along y
+    Int_t     fCathode;       // Cathode number
+    
     Int_t     fSignal;        // Signal amplitude
     Int_t     fTcharges[10];  // charge per track making this digit (up to 10)
     Int_t     fTracks[10];    // primary tracks making this digit (up to 10)
     Int_t     fPhysics;       // physics contribution to signal 
     Int_t     fHit;           // hit number - temporary solution
- public:
-    AliMUONDigit() {}
-    AliMUONDigit(Int_t *digits);
-    AliMUONDigit(Int_t *tracks, Int_t *charges, Int_t *digits);
-    virtual ~AliMUONDigit();
+
     ClassDef(AliMUONDigit,1)  //Digits for MUON
 };
 #endif

diff --git a/MUON/AliMUONHit.h b/MUON/AliMUONHit.h
index 6695b5bcec15028584545ec6d57401bbd37ae535..0fb1a90c39f481f5f5ab83219ae98426b2234617 100644 (file)
--- a/MUON/AliMUONHit.h
+++ b/MUON/AliMUONHit.h
@@ -8,7 +8,26 @@
 #include "AliHit.h"
 
 class AliMUONHit : public AliHit {
+
  public:
+    
+    AliMUONHit() {}
+    AliMUONHit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits);
+    virtual ~AliMUONHit() {}
+    Int_t   Chamber()  {return fChamber;}
+    Float_t Particle() {return fParticle;}    
+    Float_t Theta()    {return fTheta;}
+    Float_t Phi()      {return fPhi;}
+    Float_t Tlength()  {return fTlength;}
+    Float_t Eloss()    {return fEloss;}
+    Float_t Age()      {return fAge;}
+    Int_t   PHfirst()  {return fPHfirst;}
+    Int_t   PHlast()   {return fPHlast;}
+    Float_t Momentum() {return fPTot;}
+    Float_t Cx()       {return fCxHit;}
+    Float_t Cy()       {return fCyHit;}
+    Float_t Cz()       {return fCzHit;}
+ private:
     Int_t     fChamber;       // Chamber number
     Float_t   fParticle;      // Geant3 particle type
     Float_t   fTheta ;        // Incident theta angle in degrees      
@@ -23,12 +42,7 @@ class AliMUONHit : public AliHit {
     Float_t   fCxHit;         // Px/P
     Float_t   fCyHit;         // Py/P
     Float_t   fCzHit;         // Pz/P
-
- public:
-    AliMUONHit() {}
-    AliMUONHit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits);
-    virtual ~AliMUONHit() {}
     
-    ClassDef(AliMUONHit,1)  //Hit object for MUON
+    ClassDef(AliMUONHit,1)    //Hit object for MUON
 };
 #endif

diff --git a/MUON/AliMUONPadHit.h b/MUON/AliMUONPadHit.h
index 62fdf33c3e4d1d632c363c80f00c2f622e4887e9..5d4ad2aec5fbd3451e07ff59bf568b4310b4fddf 100644 (file)
--- a/MUON/AliMUONPadHit.h
+++ b/MUON/AliMUONPadHit.h
@@ -9,8 +9,22 @@
 
 
 class AliMUONPadHit : public TObject {
+ 
 public:
-
+   AliMUONPadHit() {
+      fHitNumber=fQ=fPadX=fPadY=fQpad=fRSec=0;   
+}
+   AliMUONPadHit(Int_t *clhits);
+   virtual ~AliMUONPadHit() {;}
+   Int_t   HitNumber()  {return fHitNumber;}
+   Int_t   Cathode()    {return fCathode;}
+   Int_t   Q()          {return fQ;}
+   Int_t   PadX()       {return fPadX;}   
+   Int_t   PadY()       {return fPadY;}
+   Int_t   QPad()       {return fQpad;}
+   Int_t   RSec()       {return fRSec;}
+   
+ private:
    Int_t     fHitNumber;    // Hit number
    Int_t     fCathode;      // Cathode number
    Int_t     fQ  ;          // Total charge      
@@ -18,14 +32,6 @@ public:
    Int_t     fPadY  ;       // Pad number along Y
    Int_t     fQpad  ;       // Charge per pad
    Int_t     fRSec  ;       // R -sector of pad
- 
-public:
-   AliMUONPadHit() {
-      fHitNumber=fQ=fPadX=fPadY=fQpad=fRSec=0;   
-}
-   AliMUONPadHit(Int_t *clhits);
-   virtual ~AliMUONPadHit() {;}
- 
    ClassDef(AliMUONPadHit,1)  // MUON Pad Hit
 };
 #endif