Option for customized binning (as in AliUEHist), EventMixing binning now derived...

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

diff --git a/MUON/mapping/AliMpZone.h b/MUON/mapping/AliMpZone.h
index dfc05123e5de3c9298c7076f84aec2c7ea91d818..d470b25b6e95ed39e75a3a1ba483462f80a6303a 100755 (executable)
--- a/MUON/mapping/AliMpZone.h
+++ b/MUON/mapping/AliMpZone.h
@@ -17,33 +17,13 @@
 #define ALI_MP_ZONE_H
 
 #include <TObject.h>
-
-#include "AliMpContainers.h"
-
-#include <TVector2.h>
-#ifdef WITH_ROOT
 #include <TObjArray.h>
-#endif
-
-#ifdef WITH_STL
-#include <vector>
-#endif
 
 class AliMpSubZone;
 class AliMpVMotif;
 
 class AliMpZone : public TObject
 {
-  public:
-#ifdef WITH_STL
-    /// Sub zone vector type
-    typedef std::vector<AliMpSubZone*>  SubZoneVector;
-#endif
-#ifdef WITH_ROOT
-    /// Sub zone vector type
-    typedef TObjArray  SubZoneVector;
-#endif
-
   public:
     AliMpZone(Int_t id);
     AliMpZone();
@@ -53,38 +33,41 @@ class AliMpZone : public TObject
     void AddSubZone(AliMpSubZone* subZone);
 
     // find methods
-    AliMpSubZone* FindSubZone(AliMpVMotif* motif) const;
+    AliMpSubZone* FindSubZone(const AliMpVMotif* motif) const;
     
     // set methods
-    void SetPadDimensions(const TVector2& padDimensions);
+    void SetPadDimensions(Double_t dx, Double_t dy);
     
     // access methods
     UInt_t    GetID() const;
     Int_t     GetNofSubZones() const;
     AliMpSubZone*  GetSubZone(Int_t i) const;
-    TVector2  GetPadDimensions() const;
+
+    Double_t  GetPadDimensionX() const;
+    Double_t  GetPadDimensionY() const;
 
   private:
     // data members
     UInt_t        fID;           ///< ID
-    SubZoneVector fSubZones;     ///< subzones
-    TVector2      fPadDimensions;///< pad dimensions
+    TObjArray     fSubZones;     ///< subzones
+    Double_t      fPadDimensionX;///< pad x dimension
+    Double_t      fPadDimensionY;///< pad y dimension
 
-  ClassDef(AliMpZone,1)  // Zone
+  ClassDef(AliMpZone,2)  // Zone
 };
 
 // inline functions
 
-/// Set pad dimensions
-inline  void AliMpZone::SetPadDimensions(const TVector2& padDimensions)
-{ fPadDimensions = padDimensions; }
-
 /// Return ID
 inline  UInt_t  AliMpZone::GetID() const 
 { return fID; }
 
-/// Return pad dimensions
-inline  TVector2  AliMpZone::GetPadDimensions() const 
-{ return fPadDimensions;}
+/// Return pad x dimensions
+inline  Double_t AliMpZone::GetPadDimensionX() const 
+{ return fPadDimensionX; }
+
+/// Return pad y dimensions
+inline  Double_t AliMpZone::GetPadDimensionY() const 
+{ return fPadDimensionY; }
 
 #endif //ALI_MP_ZONE_H