X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerElectronics.h;h=7c34db144c58abbf335ee094e4976b01d8d5fdeb;hb=8221b41b8b59a093459af5fb8dc493ce12117bbd;hp=6fe43eab7a4727435e285b001d7c8ec55a0533c9;hpb=4c0f0f5df53d77a504f43a9e8f886dab8348971a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTriggerElectronics.h b/MUON/AliMUONTriggerElectronics.h
index 6fe43eab7a4..7c34db144c5 100644
--- a/MUON/AliMUONTriggerElectronics.h
+++ b/MUON/AliMUONTriggerElectronics.h
@@ -5,7 +5,13 @@
 
 /* $Id$ */
 
-//*-- Author: Rachid Guernane (LPCCFd)
+/// \ingroup sim 
+/// \class AliMUONTriggerElectronics
+/// \brief Manager class for muon trigger electronics
+///
+/// Client of trigger board classes
+///
+/// \author Rachid Guernane (LPCCFd)
 
 #ifndef ROOT_TTask
 #  include "TTask.h"
@@ -23,29 +29,29 @@ class AliMUONTriggerCrate;
 class AliMUONCalibrationData;
 class AliMUONData;
 class AliMUONGlobalTriggerBoard;
-class TClonesArray;
+class AliMUONTriggerCrateStore;
+class AliMUONLocalTrigger;
+class AliMUONGlobalTrigger;
 
 class AliMUONTriggerElectronics : public TTask
 {
    public:
-      AliMUONTriggerElectronics(AliMUONData* Data = 0, AliMUONCalibrationData* =0);
+      AliMUONTriggerElectronics(AliMUONData* data = 0, 
+                                AliMUONCalibrationData* calibData=0);
       virtual ~AliMUONTriggerElectronics();
 
       virtual void Exec(Option_t*);
       
 //    CRATE CONFIG FROM ASCII FILE
-      virtual void SetDataSource(TString SourceFile = "$ALICE_ROOT/MUON/data/CRATE.TXT") 
+      virtual void SetDataSource(TString SourceFile = 
+                                 "$ALICE_ROOT/MUON/mapping/data/stationTrigger/crate.dat") 
       {fSourceFileName = SourceFile;}
 
-      virtual void Factory(AliMUONCalibrationData*);
-      void LoadMasks(AliMUONCalibrationData*);
-      virtual void AddCrate(char *name);
+      virtual void Factory(AliMUONCalibrationData* calibData);
+      void LoadMasks(AliMUONCalibrationData* calibData);
 
-      virtual AliMUONTriggerCrate* Crate(char *name);
-
-      virtual void Feed();
       virtual void Feed(UShort_t pattern[2][4]);
-		virtual void FeedM();
+		  virtual void FeedM();
 
       virtual void BoardName(Int_t ix, Int_t iy, char *name);
 
@@ -66,26 +72,20 @@ class AliMUONTriggerElectronics : public TTask
       virtual void ClearDigitNumbers();
       virtual void DigitFiredCircuit(Int_t circuit, Int_t cathode, Int_t chamber, Int_t digit);
 
-//      virtual AliMUONData* GetMUONData() {return fMUONData;}
-
-   protected:
+   private:
       AliMUONTriggerElectronics(const AliMUONTriggerElectronics& right);
       AliMUONTriggerElectronics&  operator = (const AliMUONTriggerElectronics& right);
      
    private:
-      TString                    fSourceFileName;
-      TClonesArray              *fCrates;
-      AliMUONGlobalTriggerBoard *fGlobalTriggerBoard;
-      Int_t                      fNCrates;
-      static const Int_t         fgkNCrates;
-      UShort_t                   fLocal[16][16];     // 16 crates of 16 LB
-      UShort_t                   fRegional[16];
-      UShort_t                   fGlobal;
-      AliMUONData               *fMUONData;          //! Data container for MUON subsystem 
-      TArrayI                    fDigitNumbers[234]; //! The digit number that fired a circuit.
-      char                     **fCrateMap;
-      Int_t                      fBoardMap[234];
-
-   ClassDef(AliMUONTriggerElectronics,1)
+      TString                    fSourceFileName;     ///< Source file
+      AliMUONTriggerCrateStore  *fCrates;             ///< Crate array
+      AliMUONGlobalTriggerBoard *fGlobalTriggerBoard; ///< Global trigger board
+      AliMUONData               *fMUONData;           //!< Data container for MUON subsystem 
+      TArrayI                    fDigitNumbers[234];  //!< The digit number that fired a circuit.
+
+      AliMUONLocalTrigger*       fLocalTrigger;       //!< pointer for local trigger container
+      AliMUONGlobalTrigger*      fGlobalTrigger;      //!< pointer for global trigger container
+
+   ClassDef(AliMUONTriggerElectronics,2)
 };
 #endif