Fixing coding conventions (RC22)

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

diff --git a/MUON/mapping/AliMpDEManager.h b/MUON/mapping/AliMpDEManager.h
index 5fea7b533b421c3c23cf70927b8323213a2168be..5d31330fa18e833edaf93e21e89deaacf0af686b 100644 (file)
--- a/MUON/mapping/AliMpDEManager.h
+++ b/MUON/mapping/AliMpDEManager.h
@@ -25,9 +25,14 @@
 
 #include "AliMpExMap.h"
 #include "AliMpPlaneType.h"
+#include "AliMpCathodType.h"
 #include "AliMpStationType.h"
+#include "AliMpStation12Type.h"
+#include "AliMpDEIterator.h"
+#include "AliMpEncodePair.h"
 
-class AliMpVSegmentation;
+class AliMpDetElement;
+class TString;
 
 class AliMpDEManager : public  TObject {
 
@@ -36,45 +41,36 @@ class AliMpDEManager : public  TObject {
     
     // methods
     static Bool_t IsValidDetElemId(Int_t detElemId, Bool_t warn = false);
-    static Bool_t IsValidCathod(Int_t cath, Bool_t warn = false);
-    static Bool_t IsValid(Int_t detElemId, Int_t cath, Bool_t warn = false);
     static Bool_t IsValidChamberId(Int_t chamberId, Bool_t warn = false);
     static Bool_t IsValidGeomModuleId(Int_t moduleId, Bool_t warn = false);
 
-    static TString GetDEName(Int_t detElemId, Int_t cath, Bool_t warn = true);
-    static TString GetDETypeName(Int_t detElemId, Int_t cath, Bool_t warn = true);
     static Int_t   GetChamberId(Int_t detElemId, Bool_t warn = true);    
     static Int_t   GetGeomModuleId(Int_t detElemId, Bool_t warn = true);    
-    static AliMpPlaneType   GetPlaneType(Int_t detElemId, Int_t cath);
-    static AliMpStationType GetStationType(Int_t detElemId);
-    static Int_t            GetCathod(Int_t detElemId, AliMpPlaneType planeType);
+    static AliMp::PlaneType     GetPlaneType(Int_t detElemId, AliMp::CathodType cath);
+    static AliMp::CathodType    GetCathod(Int_t detElemId, AliMp::PlaneType planeType);
+    static AliMp::StationType   GetStationType(Int_t detElemId);
+    static AliMq::Station12Type GetStation12Type(Int_t detElemId);
+
+    static AliMpDetElement* GetDetElement(Int_t detElemId, Bool_t warn = true);
+    static AliMpDetElement* GetDetElement(const TString& deName, Bool_t warn = true);
+
+    static Int_t     GetNofDEInChamber(Int_t chamberId, Bool_t warn = true);
+    static MpPair_t  GetDetElemIdRange(Int_t chamberId);
 
-    static Int_t GetNofDEInChamber(Int_t chamberId, Bool_t warn = true);
   private:
+    /// Not implemented
     AliMpDEManager();
+    /// Not implemented
     AliMpDEManager(const AliMpDEManager& rhs);
+    /// Not implemented
     AliMpDEManager& operator=(const AliMpDEManager& rhs);
 
-    // methods
-    static Bool_t IsPlaneType(const TString& planeTypeName);
-    static AliMpPlaneType   PlaneType(const TString& planeTypeName);
-    static AliMpStationType StationType(const TString& stationTypeName);
-
-    static Bool_t ReadDENames(AliMpStationType station);
-    static void   FillDENames();
-
-    // static data members     
-    static const char  fgkNameSeparator; ///< Separator character used in DE names
-    static const char  fgkCommentPrefix; ///< Comment prefix in DE names file
-    static const Int_t fgkCoefficient;   ///< Coefficient used in DE Id <-> station
-
-    // data members    
-    static  AliMpExMap fgDENamesMap;  ///< \brief Map between DE Ids and 
-                                      /// a pair of DE names for 2 cathods
-    static  AliMpExMap fgDECathBNBMap;///< \brief  Map between DE Is and a pair
-                                      /// of planeTypes for cathodes (0,1)
-    static  TArrayI fgNofDEPerChamber;///< number of detElemId per chamber
+    // static methods
+    static  TArrayI&  GetNofDEPerChamber();
       
+    // static data members     
+    static const Int_t  fgkCoefficient; ///< Coefficient used in DE Id <-> station
+
   ClassDef(AliMpDEManager,0)  // The manager class for definition of detection element types
 };