Fix for the problem during PbPb run of Nov 2010 (Indra)

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

diff --git a/MUON/mapping/AliMpPCB.h b/MUON/mapping/AliMpPCB.h
index 83612747f703de3e88021069fa4c4859c0c6aba0..bb73e27f6f05de71e2bdc4a125f5649a43c17817 100644 (file)
--- a/MUON/mapping/AliMpPCB.h
+++ b/MUON/mapping/AliMpPCB.h
@@ -13,34 +13,29 @@
 #ifndef ALIMPPCB_H
 #define ALIMPPCB_H
 
-#ifndef ROOT_TObject
-#  include "TObject.h"
+#ifndef ALI_MP_VPAD_ITERATOR_H
+#  include "AliMpVPadIterator.h"
 #endif
 
-#ifndef ROOT_TString
-#  include "TString.h"
+#ifndef ALI_MP_AREA_H
+#  include "AliMpArea.h"
 #endif
 
-#  ifndef ROOT_TArraI
-#    include "TArrayI.h"
-#  endif
 
-#include "AliMpContainers.h"
+#ifndef ROOT_TObject
+#  include "TObject.h"
+#endif
 
-#ifdef WITH_ROOT
-#  ifndef ROOT_TObjArray
-#    include "TObjArray.h"
-#  endif
-#else
-#  include <vector>
+#ifndef ROOT_TString
+#  include "TString.h"
 #endif
 
-#ifndef ALI_MP_VPAD_ITERATOR_H
-#  include "AliMpVPadIterator.h"
+#ifndef ROOT_TArraI
+#  include "TArrayI.h"
 #endif
 
-#ifndef ALI_MP_AREA_H
-#  include "AliMpArea.h"
+#ifndef ROOT_TObjArray
+#  include "TObjArray.h"
 #endif
 
 class AliMpSlatMotifMap;
@@ -52,14 +47,6 @@ class AliMpPCB : public TObject
 {
  public:
 
-#ifdef WITH_ROOT
-  /// Type def for the array size
-  typedef Int_t  Size_t;
-#else  
-  /// Type def for the array size
-  typedef UInt_t Size_t;
-#endif
-  
   AliMpPCB();
   /** Ctor. The sizes are given in mm.
       See full doc for the meaning of enveloppe parameters.
@@ -125,7 +112,7 @@ class AliMpPCB : public TObject
   /** Returns the i-th motifPosition of this PCB.
       i : [0..GetSize()-1]
   */
-  AliMpMotifPosition* GetMotifPosition(Size_t i) const;
+  AliMpMotifPosition* GetMotifPosition(Int_t i) const;
 
   /// Returns the motifPosition which contains the pad at (ix,iy).
   AliMpMotifPosition* FindMotifPosition(Int_t ix, Int_t iy) const;
@@ -134,7 +121,7 @@ class AliMpPCB : public TObject
   AliMpMotifPosition* FindMotifPosition(Double_t x, Double_t y) const;
 
   /// The number of motifs, aka manus.
-  Size_t GetSize() const;
+  Int_t GetSize() const;
 
   Int_t GetNofPadsX() const;
   Int_t GetNofPadsY() const;
@@ -168,11 +155,7 @@ class AliMpPCB : public TObject
   Int_t fIxmax; ///< max pad index in x
   Int_t fIymin; ///< min pad index in y
   Int_t fIymax; ///< max pad index in y
-#ifdef WITH_ROOT
   TObjArray fMotifPositions; ///< array of motifs
-#else  
-  std::vector<AliMpMotifPosition*> fMotifPositions; ///< array of motif positions
-#endif
   Int_t fNofPads; ///< number of pads in this PCB
   AliMpSlatMotifMap* fMotifMap; ///< to keep track of things to avoid duplications of motif and motiftypes, and get proper deletion