Coding conventions

diff --git a/ITS/AliITShit.cxx b/ITS/AliITShit.cxx
index bbba8c13bfbd01bc6f99484e8bcb30047aceae45..a0b60505989901581c27a46a2f4dc56cb735af98 100644 (file)
--- a/ITS/AliITShit.cxx
+++ b/ITS/AliITShit.cxx
@@ -17,13 +17,7 @@
 
 #include <Riostream.h>
 
-#include <TMath.h>
-#include <TRandom.h>
-#include <TVector.h>
-#include <TGeometry.h>
-#include <TNode.h>
-#include <TTUBE.h>
-#include "TParticle.h"
+#include<TLorentzVector.h>
 
 #include "AliRun.h"
 #include "AliITS.h"
@@ -555,7 +549,7 @@ Int_t AliITShit::GetModule(){
     }
 }
 //______________________________________________________________________
-TParticle * AliITShit::GetParticle(){
+TParticle * AliITShit::GetParticle() const {
 ////////////////////////////////////////////////////////////////////////
 //     Returns the pointer to the TParticle for the particle that created
 // this hit. From the TParticle all kinds of information about this 
@@ -564,7 +558,7 @@ TParticle * AliITShit::GetParticle(){
     return gAlice->GetMCApp()->Particle(GetTrack());
 }  
 //----------------------------------------------------------------------
-void AliITShit::Print(ostream *os){
+void AliITShit::Print(ostream *os) const {
 ////////////////////////////////////////////////////////////////////////
 // Standard output format for this class.
 ////////////////////////////////////////////////////////////////////////
@@ -596,7 +590,7 @@ void AliITShit::Print(ostream *os){
     return;
 }
 //----------------------------------------------------------------------
-void AliITShit::Read(istream *is){
+void AliITShit::Read(istream *is) {
 ////////////////////////////////////////////////////////////////////////
 // Standard input format for this class.
 ////////////////////////////////////////////////////////////////////////

diff --git a/ITS/AliITShit.h b/ITS/AliITShit.h
index 90c44b541060ea187f3ae320488de25d8e4fbb94..ffb716abd169eb27c2beb2a8456cd074fe880871 100644 (file)
--- a/ITS/AliITShit.h
+++ b/ITS/AliITShit.h
@@ -5,13 +5,6 @@
 
 /* $Id$ */
 
-#include "AliHit.h" 
-#include <Riostream.h>
-#include <TLorentzVector.h>
-
-class TParticle;
-
-class AliITShit : public AliHit {
 ////////////////////////////////////////////////////////////////////////
 // Version: 0
 // Written by Rene Brun, Federico Carminati, and Roberto Barbera
@@ -91,11 +84,13 @@ class AliITShit : public AliHit {
 //
 //
 ////////////////////////////////////////////////////////////////////////
-    // public;       // defined in AliHit
-    // Int_t fTrack  // defined in AliHit
-    // Float_t fX;   // defined in AliHit
-    // Float_t fY;   // defined in AliHit
-    // Float_t fZ;   // defined in AliHit
+
+#include "AliHit.h" 
+
+class TLorentzVector;
+class TParticle;
+
+class AliITShit : public AliHit {
 
  public:
     AliITShit();// Default consrtructor
@@ -209,23 +204,23 @@ class AliITShit : public AliHit {
     // Returns particle Y momentum at this hit in local coordinates.
     virtual Float_t GetPZL();
     // Returns particle Z momentum at this hit in local coordinates.
-    virtual TParticle * GetParticle(); // Returns pointer to this particle.
-    Bool_t StatusInside() {// checks if the particle is "inside"
+    virtual TParticle * GetParticle() const; // Returns ptr to this particle.
+    Bool_t StatusInside() const {// checks if the particle is "inside"
        if((fStatus&0x0001)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusEntering() {// checks if the particle is "entering"
+    Bool_t StatusEntering() const {// checks if the particle is "entering"
        if((fStatus&0x0002)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusExiting() {// checks if the particle is "exiting"
+    Bool_t StatusExiting() const {// checks if the particle is "exiting"
        if((fStatus&0x0004)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusOut() {// checks if the particle is "out"
+    Bool_t StatusOut() const {// checks if the particle is "out"
        if((fStatus&0x0008)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusDisappeared() {// checks if the particle is "disappeared"
+    Bool_t StatusDisappeared() const {// checks if the part. is "disappeared"
        if((fStatus&0x00010)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusStop() {// checks if the particle is "stopped"
+    Bool_t StatusStop() const {// checks if the particle is "stopped"
        if((fStatus&0x00020)==0) return kFALSE;else return kTRUE;}
-    Bool_t StatusAlive() {// checks if the particle is "alive"
+    Bool_t StatusAlive() const {// checks if the particle is "alive"
        if((fStatus&0x00030)==0) return kFALSE;else return kTRUE;}
     // Prints out the content of this class in ASCII format.
-    void Print(ostream *os); 
+    void Print(ostream *os) const; 
     // Reads in the content of this class in the format of Print
     void Read(istream *is);
 

diff --git a/ITS/AliITSvtest.cxx b/ITS/AliITSvtest.cxx
index 730764c9c26d01ba40ba051f8fd6dd9f496b33fc..67ff26a7c0d81ac69d429cf89eb9cf20dd937b51 100644 (file)
--- a/ITS/AliITSvtest.cxx
+++ b/ITS/AliITSvtest.cxx
@@ -29,6 +29,7 @@
 #include <Riostream.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include<TLorentzVector.h>
 #include <TMath.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>