Coding violations corrected.

(the remaining are related to the usage of templates and the use
of _t for enum types).

diff --git a/STEER/AliAODTrack.cxx b/STEER/AliAODTrack.cxx
index 4913a56edf49b3f06a992fe8b4db44d967cc8580..ef7cfcde0ff2c41a4e619722645a66f1083620be 100644 (file)
--- a/STEER/AliAODTrack.cxx
+++ b/STEER/AliAODTrack.cxx
@@ -330,10 +330,10 @@ void AliAODTrack::ConvertAliPIDtoAODPID()
   // Everything else has to be set to zero.
 
   fPID[kDeuteron] = 0.;
-  fPID[kTriton] = 0.;
-  fPID[kHelium3] = 0.;
-  fPID[kAlpha] = 0.;
-  fPID[kUnknown] = 0.;
+  fPID[kTriton]   = 0.;
+  fPID[kHelium3]  = 0.;
+  fPID[kAlpha]    = 0.;
+  fPID[kUnknown]  = 0.;
   
   return;
 }
@@ -342,7 +342,7 @@ void AliAODTrack::ConvertAliPIDtoAODPID()
 //______________________________________________________________________________
 template <class T> void AliAODTrack::SetP(const T *p, const Bool_t cartesian) 
 {
-  // set the momentum
+  // Set the momentum
 
   if (p) {
     if (cartesian) {
@@ -421,6 +421,8 @@ void AliAODTrack::Print(Option_t* /* option */) const
 }
 
 void AliAODTrack::SetMatchTrigger(Int_t MatchTrigger){
+//
+// Set the MUON trigger information
   switch(MatchTrigger){
     case 0: // 0 track does not match trigger
       fITSMuonClusterMap=fITSMuonClusterMap&0x3fffffff;
@@ -441,10 +443,14 @@ void AliAODTrack::SetMatchTrigger(Int_t MatchTrigger){
 }
 
 void AliAODTrack::SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh){
+//
+// Set the MUON hit pattern (1 bit per chamber) 
   fITSMuonClusterMap=(fITSMuonClusterMap&0xffff00ff)|(hitsPatternInTrigCh<<8);
 }
 
 Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Char_t *cathode){
+//
+// Retrieve hit information for MUON identified by  (station, plane, cathode)
   if(cathode){
     if(cathode[0]=='x'||cathode[0]=='X'){
       if(istation==1){
@@ -507,6 +513,7 @@ Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Char_t *cathode){
 }
 
 Int_t AliAODTrack::HitsMuonChamber(Int_t MuonChamber){
+// Retrieve hit information for MUON Chamber
   switch(MuonChamber){
     case 11:
       return HitsMT(1,1);

diff --git a/STEER/AliAODTrack.h b/STEER/AliAODTrack.h
index abe69c875c7b45ac8f4b3a99553e4a320d01f4c4..8b4c7348a8ace0bc95d86ce9ffbd9228690cf64a 100644 (file)
--- a/STEER/AliAODTrack.h
+++ b/STEER/AliAODTrack.h
@@ -150,7 +150,7 @@ class AliAODTrack : public AliVirtualParticle {
   UChar_t GetITSClusterMap() const     { return (UChar_t)fITSMuonClusterMap; }
   UInt_t  GetMUONClusterMap() const    { return fITSMuonClusterMap/65536; }
   UInt_t  GetITSMUONClusterMap() const { return fITSMuonClusterMap; }
-  Bool_t  TestFilterBit(UInt_t filterBit) {return (Bool_t) ((filterBit & fFilterMap) != 0);}
+  Bool_t  TestFilterBit(UInt_t filterBit) const {return (Bool_t) ((filterBit & fFilterMap) != 0);}
 
   AliAODVertex *GetProdVertex() const { return (AliAODVertex*)fProdVertex.GetObject(); }
   
@@ -180,17 +180,17 @@ class AliAODTrack : public AliVirtualParticle {
   void SetMuonClusterMap(UInt_t muonClusMap)       { fITSMuonClusterMap = muonClusMap*65536; }
   void SetITSMuonClusterMap(UInt_t itsMuonClusMap) { fITSMuonClusterMap = itsMuonClusMap; }
 
-  Int_t    GetMatchTrigger() const {return fITSMuonClusterMap>>30;}
+  Int_t GetMatchTrigger() const {return fITSMuonClusterMap>>30;}
                                        //  0 Muon track does not match trigger
                                        //  1 Muon track match but does not pass pt cut
                                        //  2 Muon track match Low pt cut
                                        //  3 Muon track match High pt cut
   void     SetMatchTrigger(Int_t MatchTrigger);
-  Int_t    MatchTrigger(){ return (GetMatchTrigger()>0)?1:0; } //  Muon track matches trigger track
-  Int_t    MatchTriggerAnyPt(){ return (GetMatchTrigger()>0)?1:0; }    //  Muon track matches trigger track
-  Int_t    MatchTriggerLowPt(){ return (GetMatchTrigger()>1)?1:0; }    //  Muon track matches trigger track and passes Low pt cut
-  Int_t    MatchTriggerHighPt(){ return (GetMatchTrigger()>2)?1:0; }   //  Muon track matches trigger track and passes High pt cut
-  Double_t GetChi2MatchTrigger() const {return fChi2MatchTrigger;}
+  Int_t    MatchTrigger() const { return (GetMatchTrigger()>0)?1:0; }  //  Muon track matches trigger track
+  Int_t    MatchTriggerAnyPt()   const  { return (GetMatchTrigger()>0)?1:0; }  //  Muon track matches trigger track
+  Int_t    MatchTriggerLowPt()   const  { return (GetMatchTrigger()>1)?1:0; }  //  Muon track matches trigger track and passes Low pt cut
+  Int_t    MatchTriggerHighPt()  const  { return (GetMatchTrigger()>2)?1:0; }  //  Muon track matches trigger track and passes High pt cut
+  Double_t GetChi2MatchTrigger() const  { return fChi2MatchTrigger;}
   void     SetChi2MatchTrigger(Double_t Chi2MatchTrigger) {fChi2MatchTrigger = Chi2MatchTrigger;}
   UShort_t GetHitsPatternInTrigCh() const { return (fITSMuonClusterMap&0xff00)>>8; }
   void     SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh);