Fixing coding conventions

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

diff --git a/MUON/AliMUON2DMapIterator.h b/MUON/AliMUON2DMapIterator.h
index de10eb0e4911c7e6814790543f82a56ac99035e3..1fe82d47805f972816453a0b542b1b92ca94715d 100644 (file)
--- a/MUON/AliMUON2DMapIterator.h
+++ b/MUON/AliMUON2DMapIterator.h
@@ -6,15 +6,12 @@
 
 // $Id$
 
-/// \ingroup calib
+/// \ingroup core
 /// \class AliMUON2DMapIterator
 /// \brief Implementation of TIterator for 2D maps
 /// 
 //  Author Laurent Aphecetche
 
-#ifndef ROOT_TExMap
-#  include "TExMap.h"
-#endif
 #ifndef ROOT_TIterator
 #  include "TIterator.h"
 #endif
@@ -26,9 +23,6 @@ class AliMUON2DMapIterator : public TIterator
 {
 public:
   AliMUON2DMapIterator(const AliMpExMap& theMap);
-  AliMUON2DMapIterator(const AliMUON2DMapIterator& rhs);
-  AliMUON2DMapIterator& operator=(const AliMUON2DMapIterator& rhs);
-  TIterator& operator=(const TIterator& rhs);
   
   virtual ~AliMUON2DMapIterator();
   
@@ -40,16 +34,21 @@ public:
   virtual const TCollection* GetCollection() const;
   
 private:
-  TObject* GetValue(TExMapIter& iter, Int_t& key) const;
-  AliMpExMap* GetMap(TExMapIter& iter, Int_t& key) const;
+  TIterator* NextIterator();
   
 private:
-  TExMapIter fIter; //!< first iterator
-  TExMapIter* fIter2; //!< second iterator
-  Int_t fCurrentI; //!< current index in direction i 
-  Int_t fCurrentJ; //!< current index in direction j
+  /// Not implemented
+  AliMUON2DMapIterator(const AliMUON2DMapIterator& rhs);
+  /// Not implemented
+  AliMUON2DMapIterator& operator=(const AliMUON2DMapIterator& rhs);
+  /// Overriden TIterator virtual operator=
+  AliMUON2DMapIterator& operator=(const TIterator& rhs);
 
-  ClassDef(AliMUON2DMapIterator,0) // VDataIterator for 2D maps
+  const AliMpExMap* fkMap; ///< Top map we iterate upon
+  TIterator* fIter1; ///< first iterator
+  TIterator* fIter2; ///< second iterator
+  
+  ClassDef(AliMUON2DMapIterator,0) // TIterator for AliMUON2D maps
 };