Coverity Fix.

[u/mrichter/AliRoot.git] / MUON / AliMUONHit.h

diff --git a/MUON/AliMUONHit.h b/MUON/AliMUONHit.h
index b62539a66bfba350301be2a77833c12823503778..cd3bf2484da7e18b2b9c4d856da96810c4124c2e 100644 (file)
--- a/MUON/AliMUONHit.h
+++ b/MUON/AliMUONHit.h
@@ -6,11 +6,11 @@
 /* $Id$ */
 // Revision of includes 07/05/2004
 
-/// \ingroup base
+/// \ingroup sim
 /// \class AliMUONHit
 /// \brief MonteCarlo hit
 ///
-/// MUON classe for MonteCarlo Hits, inherited from AliHit for the 
+/// MUON class for MonteCarlo Hits, inherited from AliHit for the 
 /// In addition to the ALiHit data member fX, fY, fZ and fTrack, AliMUONHit contains some info about the particle crossing the chamber:
 /// Impulsion: fPtot, fPx, fPy and fPz
 /// Reference position at the center of the chamber (wire plane) fXref, fYref and fZref
@@ -26,61 +26,53 @@ class AliMUONHit : public AliHit {
  public:
     
     AliMUONHit();
-    AliMUONHit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits); 
-               // TBR
-    AliMUONHit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits,
-               Bool_t isNew);
+    AliMUONHit(Int_t fIshunt, Int_t track, Int_t *vol, Float_t *hits);
 
-    AliMUONHit(Int_t fIshunt, Int_t track, Int_t iChamber, Int_t idpart, 
-               Float_t X, Float_t Y, Float_t Z, Float_t tof, Float_t momentum, 
-              Float_t theta, Float_t phi, Float_t length, Float_t destep);
-              // TBR
     AliMUONHit(Int_t fIshunt, Int_t track, Int_t detElemId, Int_t idpart, 
                Float_t X, Float_t Y, Float_t Z, Float_t tof, Float_t momentum, 
-              Float_t theta, Float_t phi, Float_t length, Float_t destep, Bool_t isNew);
+              Float_t theta, Float_t phi, Float_t length, Float_t destep);
 
-    AliMUONHit(Int_t fIshunt, Int_t track, Int_t iChamber, Int_t idpart, 
-               Float_t X, Float_t Y, Float_t Z, Float_t tof, Float_t momentum, 
-               Float_t theta, Float_t phi, Float_t length, Float_t destep,
-               Float_t Xref, Float_t Yref, Float_t Zref);
-              // TBR
     AliMUONHit(Int_t fIshunt, Int_t track, Int_t detElemId, Int_t idpart, 
                Float_t X, Float_t Y, Float_t Z, Float_t tof, Float_t momentum, 
                Float_t theta, Float_t phi, Float_t length, Float_t destep,
-               Float_t Xref, Float_t Yref, Float_t Zref, Bool_t isNew);
-    virtual ~AliMUONHit() {}
+               Float_t Xref, Float_t Yref, Float_t Zref);
+    virtual ~AliMUONHit();
 
-    Int_t   DetElemId()const;
+    virtual const char* GetName() const;
+    
+    Int_t   DetElemId()const {return fDetElemId;} ///< Return detection element ID
     Int_t   Chamber()  const;
-    Float_t Particle() const {return fParticle;}    
-    Float_t Theta()    const {return fTheta;}
-    Float_t Phi()      const {return fPhi;}
-    Float_t Tlength()  const {return fTlength;}
-    Float_t Eloss()    const {return fEloss;}
-    Float_t Age()      const {return fAge;}
-    Int_t   PHfirst()  const {return fPHfirst;}
-    Int_t   PHlast()   const {return fPHlast;}
-
-    Float_t Momentum() const {return fPTot;}
-    Float_t Px()       const {return fPx;}
-    Float_t Py()       const {return fPy;}
-    Float_t Pz()       const {return fPz;}
-    Float_t Cx()       const {return fPx/fPTot;} 
-    Float_t Cy()       const {return fPy/fPTot;}
-    Float_t Cz()       const {return fPz/fPTot;}
-
-    Float_t Xref()     const {return fXref;}
-    Float_t Yref()     const {return fYref;}
-    Float_t Zref()     const {return fZref;}
+
+    virtual void Print(Option_t* opt="") const;
+
+    Float_t Particle() const {return fParticle;}  ///< Return particle id   
+    Float_t Theta()    const {return fTheta;}     ///< Return incident theta angle in degrees
+    Float_t Phi()      const {return fPhi;}       ///< Return incident phi angle in degrees
+    Float_t Tlength()  const {return fTlength;}   ///< Return track length inside the chamber
+    Float_t Eloss()    const {return fEloss;}     ///< Return Ionisation energy loss in gas
+    Float_t Age()      const {return fAge;}       ///< Return Particle Age
+    Int_t   PHfirst()  const {return fPHfirst;}   ///< Return First padhit
+    Int_t   PHlast()   const {return fPHlast;}    ///< Return Last padhit
+
+    Float_t Momentum() const {return fPTot;}      ///< Return local momentum P of the entering track
+    Float_t Px()       const {return fPx;}        ///< Return Px
+    Float_t Py()       const {return fPy;}        ///< Return Py
+    Float_t Pz()       const {return fPz;}        ///< Return Pz
+    Float_t Cx()       const {return fPx/fPTot;}  ///< Return Px/PTot 
+    Float_t Cy()       const {return fPy/fPTot;}  ///< Return Py/PTot 
+    Float_t Cz()       const {return fPz/fPTot;}  ///< Return Pz/PTot 
+
+    Float_t Xref()     const {return fXref;}      ///< Return X position of hit in the center of the chamber (without angle effect)
+    Float_t Yref()     const {return fYref;}      ///< Return Y position of hit in the center of the chamber (without angle effect)
+    Float_t Zref()     const {return fZref;}      ///< Return Z position of hit in the center of the chamber (without angle effect)
 
  private:  
-    Bool_t    fIsDetElemId;   ///< False if fDetElemId contains Chamber Id (old code) 
     Int_t     fDetElemId;     ///< Detection element ID
     Float_t   fParticle;      ///< Geant3 particle type
     Float_t   fTheta ;        ///< Incident theta angle in degrees      
     Float_t   fPhi   ;        ///< Incident phi angle in degrees
     Float_t   fTlength;       ///< Track length inside the chamber
-    Float_t   fEloss;         ///< ionisation energy loss in gas
+    Float_t   fEloss;         ///< Ionisation energy loss in gas
     Float_t   fAge;           ///< Particle Age
     Int_t     fPHfirst;       ///< First padhit
     Int_t     fPHlast;        ///< Last padhit
@@ -95,6 +87,6 @@ class AliMUONHit : public AliHit {
     Float_t   fZref;          ///< Z position of hit in the center of the chamber (without angle effect)
 
     
-    ClassDef(AliMUONHit,1)    //Hit object for MUON
+    ClassDef(AliMUONHit,2)    //Hit object for MUON
 };
 #endif