In Mapping/macros:

[u/mrichter/AliRoot.git] / MUON / AliMUON2DMapIteratorByI.h

diff --git a/MUON/AliMUON2DMapIteratorByI.h b/MUON/AliMUON2DMapIteratorByI.h
index 69058af09ee0e41fb81ae8ec0abeac3ff0e4a4da..c9318c567b47b4852ac284169f8c268cc6aa5efb 100644 (file)
--- a/MUON/AliMUON2DMapIteratorByI.h
+++ b/MUON/AliMUON2DMapIteratorByI.h
@@ -7,19 +7,17 @@
 // $Id$
 
 /// \ingroup core
-/// \class AliMUON2DMapIteratorByIByI
+/// \class AliMUON2DMapIteratorByI
 /// \brief Implementation of TIterator for 2D maps
 /// 
 //  Author Laurent Aphecetche
 
-#ifndef ROOT_TExMap
-#  include "TExMap.h"
-#endif
 #ifndef ROOT_TIterator
 #  include "TIterator.h"
 #endif
 
 class AliMpExMap;
+class AliMpExMapIterator;
 
 //_____________________________________________________________________________
 class AliMUON2DMapIteratorByI : public TIterator
@@ -27,9 +25,6 @@ class AliMUON2DMapIteratorByI : public TIterator
 public:
   AliMUON2DMapIteratorByI(const AliMpExMap& theMap, 
                           Int_t firstI, Int_t lastI);
-  AliMUON2DMapIteratorByI(const AliMUON2DMapIteratorByI& rhs);
-  TIterator& operator=(const TIterator& rhs);
-  AliMUON2DMapIteratorByI& operator=(const AliMUON2DMapIteratorByI& rhs);
   
   virtual ~AliMUON2DMapIteratorByI();
   
@@ -39,18 +34,24 @@ public:
   virtual void Reset(); 
 
   virtual const TCollection* GetCollection() const;
-  
+
 private:
-  
-  TObject* GetValue(TExMapIter& iter, Int_t& key) const;
+    AliMpExMapIterator* NextIterator();
   
 private:
-  const AliMpExMap* fMap; //!< map to iterate upon
-  TExMapIter* fIter2; //!< second iterator
-  Int_t fCurrentI; //!< current index in direction i 
-  Int_t fCurrentJ; //!< current index in direction j
-  Int_t fFirstI; //!< first I to iterate upon
-  Int_t fLastI; //!< last I to iterate upon
+  /// Not implemented
+  AliMUON2DMapIteratorByI(const AliMUON2DMapIteratorByI& rhs);
+  /// Not implemented
+  AliMUON2DMapIteratorByI& operator=(const AliMUON2DMapIteratorByI& rhs);
+  /// Overriden TIterator virtual operator=
+  AliMUON2DMapIteratorByI& operator=(const TIterator& rhs);
+
+  const AliMpExMap* fkMap; ///< Top map we iterate upon
+  AliMpExMapIterator* fIter1; ///< first iterator
+  TIterator* fIter2; ///< second iterator
+  Int_t fFirstI; ///< start of range for I
+  Int_t fLastI; ///< end of range for I
+  Int_t fCurrentI; ///< current value of I 
   
   ClassDef(AliMUON2DMapIteratorByI,0) // VDataIterator for 2D maps
 };