Fixing a backward compatibility issue

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

diff --git a/MUON/mapping/AliMpDEIterator.h b/MUON/mapping/AliMpDEIterator.h
index b3ad62e375ec6ef6c09e79e4b41d688e6043c4a8..77f49d4ed6b1ed4b15de3c7e629193481507e80d 100644 (file)
--- a/MUON/mapping/AliMpDEIterator.h
+++ b/MUON/mapping/AliMpDEIterator.h
@@ -2,62 +2,60 @@
  * See cxx source for full Copyright notice                               */
 
 // $Id$ 
-// $MpId: AliMpDEIterator.h,v 1.4 2006/05/23 13:07:38 ivana Exp $ 
+// $MpId: AliMpDEIterator.h,v 1.5 2006/05/24 13:58:16 ivana Exp $ 
 
 /// \ingroup management
 /// \class AliMpDEIterator
-/// \brief The iterator over valid detection element IDs
+/// \brief The iterator over detection elements
 ///
-/// The valid detection element Ids are defined in the files denames*.dat.    \n
 /// It can iterate 
-/// - over all valid detection elements, if started with First() function; 
-/// - or over detection elements in a selected module, if started with
-///   First(Int_t moduleId) function                                          \n 
+/// - over all detection elements, if started with First() function; 
+/// - or over detection elements in a selected chamber, if started with
+///   First(Int_t chamberId) function                                          \n 
 /// 
-/// Author: Ivana Hrivnacova, IPN Orsay
+/// \author Ivana Hrivnacova, IPN Orsay
 
 #ifndef ALI_MP_DE_ITERATOR_H
 #define ALI_MP_DE_ITERATOR_H
 
 #include <TObject.h>
 
-#include "AliMpStationType.h"
-
 #include <TArrayI.h>
 
+class AliMpDetElement;
+class TIterator;
 class TString;
 
 class AliMpDEIterator : public  TObject {
 
   public:
     AliMpDEIterator();
-    AliMpDEIterator(const AliMpDEIterator& rhs);
+    //AliMpDEIterator(const AliMpDEIterator& rhs);
     virtual ~AliMpDEIterator();
 
     // Operators
-    AliMpDEIterator& operator=(const AliMpDEIterator& rhs);
+    //AliMpDEIterator& operator=(const AliMpDEIterator& rhs);
     
     // Methods for iterating over DE elements
     // 
     void First();
-    void First(Int_t moduleId);
+    void First(Int_t chamberId);
     void Next();
     Bool_t IsDone() const;
-    Int_t CurrentDE() const;
+    
+    AliMpDetElement* CurrentDE() const;
+    Int_t CurrentDEId() const;
 
   private:
-    // static methods
-    static Bool_t ReadDEIds(AliMpStationType station);
-    static void   ReadData();
-
-    // static data members     
-    static const Int_t  fgkMaxNofDetElements; ///< Maximum number of DEs
-    static TArrayI      fgDetElemIds;         ///< DE Ids      
-    static Int_t        fgNofDetElemIds;      ///< Number of DE Ids    
+    /// Not implemented
+    AliMpDEIterator(const AliMpDEIterator& rhs);
+    /// Not implemented
+    AliMpDEIterator& operator=(const AliMpDEIterator& rhs);
 
     // data members    
-    Int_t  fIndex;    ///< Current DE index
-    Int_t  fModuleId; ///< The iterated module 
+    AliMpDetElement* fCurrentDE; ///< current element in iteration
+    TIterator*       fIterator;  ///< iterator
+    Int_t            fChamberId; ///< The iterated chamber 
 
   ClassDef(AliMpDEIterator,0)  // The iterator over valid detection element IDs
 };