In mapping:

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

diff --git a/MUON/mapping/AliMpSlat.h b/MUON/mapping/AliMpSlat.h
index 1242b0683023d1fcbbf2ca907da9e3e768f05b27..41a4adce85863d6fc0ee25352102e14d985da290 100644 (file)
--- a/MUON/mapping/AliMpSlat.h
+++ b/MUON/mapping/AliMpSlat.h
@@ -13,12 +13,6 @@
 #ifndef ALI_MP_SLAT_H
 #define ALI_MP_SLAT_H
 
-#include <TObject.h>
-
-#ifndef ROOT_TString
-#  include "TString.h"
-#endif
-
 #ifndef ALI_MP_PAD_H
 #  include "AliMpPad.h"
 #endif
@@ -31,18 +25,25 @@
 #  include "AliMpPlaneType.h"
 #endif
 
-#include "AliMpContainers.h"
-#include "AliMpExMap.h"
+#ifndef ALI_MP_EX_MAP_H
+  #include "AliMpExMap.h"
+#endif
 
-class TArrayI;
+#ifndef ROOT_TObject
+  #include <TObject.h>
+#endif
 
-#ifdef WITH_ROOT
+#ifndef ROOT_TString
+#  include "TString.h"
+#endif
+
+#ifndef ROOT_TObjArray
 #  include "TObjArray.h"
-#else
-#  include <vector>
-//#  include <map>
 #endif
 
+class TArrayI;
+
+
 class AliMpMotifPosition;
 class AliMpPCB;
 class TArrayI;
@@ -147,11 +148,7 @@ class AliMpSlat : public TObject
   Int_t fNofPadsX; ///< Actual number of pads in x direction
   Int_t fMaxNofPadsY; ///< Maximum number of pads in y direction
   mutable AliMpExMap fManuMap; ///< map of int to AliMpMotifPosition*
-#ifdef WITH_ROOT
   TObjArray fPCBs; ///< array of AliMpPCB*
-#else  
-  std::vector<AliMpPCB*> fPCBs; ///< array of AliMpPCB*
-#endif
   TVector2 fPosition; ///< Position of the slat center.
   Int_t fNofPads; ///< number of pads in this slat