X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerIO.h;h=fd755b7a33b161b9ba068e846ed0ef3f93e2b9dc;hb=e39ae6fbf1b9c4b763bc23be00bb4ff8cc958547;hp=823b5306d4e679159cd2042fd6005e19dd164b95;hpb=5eff9abc0d3033dea4cb712266e31e7128725627;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerIO.h b/MUON/AliMUONTriggerIO.h
index 823b5306d4e..fd755b7a33b 100644
--- a/MUON/AliMUONTriggerIO.h
+++ b/MUON/AliMUONTriggerIO.h
@@ -12,21 +12,23 @@
 /// 
 //  Author Laurent Aphecetche, Subatech
 
-#ifndef ROOT_TArrayI
-#  include <TArrayI.h>
-#endif
-
 #ifndef ROOT_TObject
 #  include <TObject.h>
 #endif
 
-#include <Riostream.h>
 #include "AliMpExMap.h"
+#include "AliMpGlobalCrate.h"
+#include "AliMpRegionalTrigger.h"
+
+#ifndef ROOT_TArrayI
+#  include <TArrayI.h>
+#endif
 
 class AliMUONTriggerLut;
 class AliMUONVCalibParam;
 class AliMUONVStore;
 class AliMpExMap;
+class AliMpDDL;
 class AliMpTriggerCrate;
 class AliMpLocalBoard;
 
@@ -50,10 +52,6 @@ public:
   Bool_t WriteLUT(const AliMUONTriggerLut& lut,
                   const char* lutFileToWrite);
   
-//  void SetLocalBoardIds(const TArrayI& localBoardIds);
-  
-  Int_t LocalBoardId(Int_t index) const;
-
   Bool_t WriteMasks(const char* localFile,
 		    const char* regionalFile,
 		    const char* globalFile,
@@ -61,15 +59,13 @@ public:
                     AliMUONVStore* regionalMasks,
                     AliMUONVCalibParam* globalMasks) const;
   
+  Int_t LocalBoardId(Int_t index) const;
 
-  AliMpTriggerCrate* GetTriggerCrate(TString crateName, Bool_t warn = true) const;
-  AliMpLocalBoard*   GetLocalBoard(Int_t localBoardId, Bool_t warn = true) const;
-
-  void UpdateMapping() const;
+  void UpdateMapping(Bool_t writeFile = true) const;
 
 private:
   
-  void DeCompAddress(UChar_t &ypos, UChar_t &ytri, UChar_t &xdev, UChar_t &xpos, 
+  Bool_t DeCompAddress(UChar_t &ypos, UChar_t &ytri, UChar_t &xdev, UChar_t &xpos, 
                      UShort_t address) const;
     
   void FillLut(AliMUONTriggerLut& lut,
@@ -78,30 +74,31 @@ private:
   
   
   /// Return number of local boards
-  Int_t NofLocalBoards() const { return fNofLocalBoards; }
+  Int_t NofLocalBoards() const { return fRegionalTrigger.GetNofLocalBoards(); }
   
-  Int_t ReadRegional(const char* regionalFile, AliMUONVStore* regionalMasks, Bool_t warn = true);
+  Int_t  ReadGlobal(const char* globalFile, AliMUONVCalibParam* globalMasks);
+
+  Bool_t WriteGlobal(const char* globalFile, AliMUONVCalibParam* globalMasks) const;
+
+  Int_t  ReadRegional(const char* regionalFile, AliMUONVStore* regionalMasks, Bool_t warn = true);
 
   Bool_t WriteRegional(const char* regionalFile, AliMUONVStore* regionalMasks) const;
 
-  Int_t ReadLocalMasks(const char* localFile, AliMUONVStore& localMasks) const;
+  Int_t  ReadLocalMasks(const char* localFile, AliMUONVStore& localMasks) const;
   
   Bool_t WriteLocalMasks(const char* localFile, AliMUONVStore& localMasks) const;
 
-  void ReadLocalLUT(AliMUONTriggerLut& lut, Int_t localBoardId, FILE* flut);
+  void   ReadLocalLUT(AliMUONTriggerLut& lut, Int_t localBoardId, FILE* flut);
   
-  void WriteLocalLUT(const AliMUONTriggerLut& lut, Int_t localBoardId, 
+  void   WriteLocalLUT(const AliMUONTriggerLut& lut, Int_t localBoardId, 
                        FILE* flut);
     
   
 private:
-  TArrayI fLocalBoardIds; //!< order of the localboards
-  Int_t fNofLocalBoards; //!< number of local boards
-  AliMpExMap    fTriggerCrates;  //!< The map of trigger crate per their ID
-  AliMpExMap    fLocalBoards;    ///< The map of local board per their ID
-
-  
-  ClassDef(AliMUONTriggerIO,1) // Read/Write trigger masks and LUT to/from online files
+  AliMpRegionalTrigger  fRegionalTrigger; //!< Regional trigger
+  AliMpGlobalCrate      fGlobalCrate;     //!< Global crate object
+ 
+  ClassDef(AliMUONTriggerIO,0) // Read/Write trigger masks and LUT to/from online files
 };
 
 #endif