Fixing coding conventions (RC22)

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpDDLStore.h

diff --git a/MUON/mapping/AliMpDDLStore.h b/MUON/mapping/AliMpDDLStore.h
index ea717eb9f47b51e3ecc513477284fed056d3f1b4..e61cbe7af622c1a551d92ca26d04ba440414aac3 100644 (file)
--- a/MUON/mapping/AliMpDDLStore.h
+++ b/MUON/mapping/AliMpDDLStore.h
@@ -18,7 +18,6 @@
 #define ALI_MP_DDL_STORE_H
 
 #include "AliMpExMap.h"
-#include "AliMpIntPair.h"
 #include "AliMpRegionalTrigger.h"
 #include <TObject.h>
 #include <TObjArray.h>
@@ -36,7 +35,7 @@ class TArrayI;
 class AliMpDDLStore : public  TObject {
 
   public:
-    AliMpDDLStore(TRootIOCtor* /*ioCtor*/);
+    AliMpDDLStore(TRootIOCtor* ioCtor);
     virtual ~AliMpDDLStore();
     
     // static access method
@@ -62,10 +61,8 @@ class AliMpDDLStore : public  TObject {
     
     Int_t  GetDDLfromBus(Int_t busPatchId) const;
     Int_t  GetBusPatchId(Int_t detElemId, Int_t manuId) const;
-    
 
-    /// Get link port and DSP from busPatch id
-    AliMpIntPair  GetLinkPortId(Int_t busPatchId) const;
+    Long_t GetLinkPortId(Int_t busPatchId) const;
 
     /// Print info of all manus
     void PrintAllManu() const;
@@ -84,6 +81,10 @@ class AliMpDDLStore : public  TObject {
     /// Not implemented
     AliMpDDLStore& operator=(const AliMpDDLStore& rhs);
 
+    // static methods
+    static const TString&  GetRevertKeyword();
+    static const TString&  GetExplicitKeyword();
+
     // methods
     Int_t  GetManuListIndex(Int_t detElemId) const;
     Int_t  GetBusPatchIndex(Int_t detElemId, Int_t manuId) const;
@@ -100,11 +101,9 @@ class AliMpDDLStore : public  TObject {
     static AliMpDDLStore* fgInstance; ///< Singleton instance
     static const Int_t    fgkNofDDLs; ///< Total number of DDLs
     static const Int_t    fgkNofTriggerDDLs; ///< Total number of trigger DDLs
-    static const TString  fgkRevertKeyword; ///< A keyword for ReadBusPatchSpecial()
-    static const TString  fgkExplicitKeyword; ///< A keyword for ReadBusPatchSpecial()
 
     // data members    
-    const AliMpDataStreams&  fDataStreams;  //!< Data streams
+    const AliMpDataStreams&  fkDataStreams;  //!< Data streams
     TObjArray     fDDLs;           ///< Array of DDL objects
     AliMpExMap    fBusPatches;     ///< The map of bus patches per their IDs
     TArrayI       fManuList12[16]; ///< Arrays of 1st manu in bus