X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerCrateStore.h;h=ce497d104cc0aefbe96a778e6f3cd8666a133799;hb=040d0012cba92bb5f6736ea744c1b697c0281670;hp=ecb0646daccff5ff4596681c86f0971e83b9a902;hpb=139856523defd6c842e24ef6640d45886e722bef;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerCrateStore.h b/MUON/AliMUONTriggerCrateStore.h
index ecb0646dacc..ce497d104cc 100644
--- a/MUON/AliMUONTriggerCrateStore.h
+++ b/MUON/AliMUONTriggerCrateStore.h
@@ -6,7 +6,7 @@
 
 // $Id$
 
-/// \ingroup sim
+/// \ingroup trigger
 /// \class AliMUONTriggerCrateStore
 /// \brief A container for AliMUONTriggerCrate objects.
 /// 
@@ -16,10 +16,13 @@
 #  include "TObject.h"
 #endif
 
+#include "TString.h"
+
 class AliMUONLocalTriggerBoard;
 class AliMUONTriggerCrate;
 class AliMpExMap;
-class TExMapIter;
+class TIterator;
+class AliMUONCalibrationData;
 
 class AliMUONTriggerCrateStore : public TObject
 {
@@ -28,16 +31,24 @@ public:
   virtual ~AliMUONTriggerCrateStore();
   
   Int_t NumberOfCrates() const;
-  void FirstCrate();
-  AliMUONTriggerCrate* NextCrate();
+
   AliMUONTriggerCrate* Crate(const char* crateName) const;
-  
+  AliMUONTriggerCrate* Crate(Int_t ddl, Int_t reg) const;
+
   Int_t NumberOfLocalBoards() const;
-  void FirstLocalBoard();
-  AliMUONLocalTriggerBoard* NextLocalBoard();
+
   AliMUONLocalTriggerBoard* LocalBoard(Int_t boardNumber) const;
   
-  void ReadFromFile(const char* crateFile = "$ALICE_ROOT/MUON/data/CRATE.TXT");
+  void ReadFromFile(AliMUONCalibrationData* calibData);
+  TIterator* CreateCrateIterator() const;
+  
+  TIterator* CreateLocalBoardIterator() const;
+
+protected:
+  /// Not implemented
+  AliMUONTriggerCrateStore(const AliMUONTriggerCrateStore& rhs);
+  /// Not implemented
+  AliMUONTriggerCrateStore& operator = (const AliMUONTriggerCrateStore& rhs);
 
 private:
   void AddCrate(const char* crateName); 
@@ -45,12 +56,10 @@ private:
 private:
   AliMpExMap* fCrates; ///< list of crates
   AliMpExMap* fLocalBoards; ///< local boards (indexed by their number)
-  TExMapIter* fCrateIterator; //!< iterator for the crate map above
-  TExMapIter* fLBIterator; //!< iterator for boards (through crates)
-  AliMUONTriggerCrate* fCurrentCrate; //!< used for iterating on local board
-  Int_t fCurrentLocalBoard; //!< used for iterating on local board
 
-  ClassDef(AliMUONTriggerCrateStore,1) // Reader for CRATE.TXT file
+  TString GetCrateName(Int_t ddl, Int_t reg) const;
+
+  ClassDef(AliMUONTriggerCrateStore,2) // Reader for CRATE.TXT file
 };
 
 #endif