From: ivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 6 Apr 2009 15:19:43 +0000 (+0000)
Subject: Coding conventions
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=40a422435d392cffd292a98b434e85e6064e5f4d;p=u%2Fmrichter%2FAliRoot.git

Coding conventions
---

diff --git a/MUON/AliMUONTrack.h b/MUON/AliMUONTrack.h
index 385c1d21be9..6f7d85f3f58 100644
--- a/MUON/AliMUONTrack.h
+++ b/MUON/AliMUONTrack.h
@@ -96,7 +96,7 @@ class AliMUONTrack : public TObject
   Int_t CompatibleTrack(AliMUONTrack* track, Double_t sigma2Cut, Bool_t compatibleCluster[10]) const;
   
   /// return pointer to track parameters at vertex (can be 0x0)
-  AliMUONTrackParam* GetTrackParamAtVertex() {return fTrackParamAtVertex;}
+  AliMUONTrackParam* GetTrackParamAtVertex() const {return fTrackParamAtVertex;}
   void               SetTrackParamAtVertex(const AliMUONTrackParam* trackParam);
 
   /// set word telling which trigger chambers where hit by track
diff --git a/MUON/AliMUONTriggerIO.cxx b/MUON/AliMUONTriggerIO.cxx
index bcd43c394bd..b7c36880fab 100644
--- a/MUON/AliMUONTriggerIO.cxx
+++ b/MUON/AliMUONTriggerIO.cxx
@@ -426,7 +426,7 @@ AliMUONTriggerIO::ReadConfig(const char* localFile,
 
 //_____________________________________________________________________________
  Int_t 
- AliMUONTriggerIO::ReadGlobalConfig(const char* globalFile, AliMUONGlobalCrateConfig* globalConfig)
+ AliMUONTriggerIO::ReadGlobalConfig(const char* globalFile, AliMUONGlobalCrateConfig* globalConfig) const
 {
   /// read the global crate file
   /// the masks are disable bit for each crate, 8 per darc board
diff --git a/MUON/AliMUONTriggerIO.h b/MUON/AliMUONTriggerIO.h
index adf3b5070d4..038de1e6f25 100644
--- a/MUON/AliMUONTriggerIO.h
+++ b/MUON/AliMUONTriggerIO.h
@@ -63,7 +63,7 @@ public:
                     AliMUONGlobalCrateConfig* globalConfig) const;
 
   
-  Int_t  ReadGlobalConfig(const char* globalFile, AliMUONGlobalCrateConfig* globalConfig);
+  Int_t  ReadGlobalConfig(const char* globalFile, AliMUONGlobalCrateConfig* globalConfig) const;
 
   Bool_t WriteGlobalConfig(const char* globalFile, AliMUONGlobalCrateConfig* globalConfig) const;
 
diff --git a/MUON/mapping/AliMpEncodePair.cxx b/MUON/mapping/AliMpEncodePair.cxx
index e4e04c72e7f..048c4c32b55 100644
--- a/MUON/mapping/AliMpEncodePair.cxx
+++ b/MUON/mapping/AliMpEncodePair.cxx
@@ -15,6 +15,12 @@
 
 // $Id$
 
+// AliMp::Pair functions: 
+// The functions for encoding the pair of integers to another integer,
+// defined withing a namespace AliMp.
+// The encoded pairs can be added and subtracted.
+// Author Laurent Aphecetche
+
 #include "AliMpEncodePair.h"
 
 #include <Riostream.h>
@@ -49,6 +55,8 @@ Int_t AliMp::PairSecond(MpPair_t pair)
 //_______________________________________________________________________
 ostream& AliMp::PairPut(ostream& stream, MpPair_t pair)
 {
+/// A special printing for encoded pair.
+
   if ( pair >= 0 ) {
     stream << '(' << AliMp::PairFirst(pair) 
            << ',' << AliMp::PairSecond(pair) << ')';
diff --git a/MUON/mapping/AliMpEncodePair.h b/MUON/mapping/AliMpEncodePair.h
index b420fbe12f7..4df3d31d99a 100644
--- a/MUON/mapping/AliMpEncodePair.h
+++ b/MUON/mapping/AliMpEncodePair.h
@@ -6,6 +6,10 @@
 
 // $Id$
 
+// The functions for encodind the pair of integers to another integer,
+// defined withing a namespace AliMp
+// Author Laurent Aphecetche
+
 #include <Rtypes.h>
 #include <Riosfwd.h>
 
diff --git a/MUON/mapping/AliMpExMapIterator.h b/MUON/mapping/AliMpExMapIterator.h
index fdf6db0b313..cebbf1fde9b 100644
--- a/MUON/mapping/AliMpExMapIterator.h
+++ b/MUON/mapping/AliMpExMapIterator.h
@@ -23,9 +23,9 @@ class TExMapIter;
 //_____________________________________________________________________________
 class AliMpExMapIterator : public TIterator
 {
-public:
   friend class AliMpExMap;
 
+public:
   AliMpExMapIterator(const AliMpExMap& theMap);
   AliMpExMapIterator(const AliMpExMapIterator& rhs);
   AliMpExMapIterator& operator=(const AliMpExMapIterator& rhs);
@@ -50,8 +50,6 @@ public:
 private:
     
     Bool_t Next(Long_t& index, TObject*& object);
-
-private:
   
     TExMapIter* fIterator; ///< iterator we are wrapping