Updates to AddTask macro from Chris

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

diff --git a/MUON/AliMUONTriggerCircuit.h b/MUON/AliMUONTriggerCircuit.h
index 1b31eec9920ab6076f4855d69ca9c32494a98cba..5b226025c2ba99fc4e74c1e8bf0b1e2fa4876063 100644 (file)
--- a/MUON/AliMUONTriggerCircuit.h
+++ b/MUON/AliMUONTriggerCircuit.h
@@ -15,11 +15,10 @@
 #include <TObject.h>
 #include <TArrayF.h>
 
-#include "AliMpPad.h"
-#include "AliMpVSegmentation.h"
-#include "AliMUONGeometryTransformer.h"
-
 class AliMpLocalBoard;
+class AliMUONGeometryTransformer;
+class AliMpPad;
+class AliMpVSegmentation;
 
 class AliMUONTriggerCircuit : public TObject 
 {
@@ -32,30 +31,35 @@ public:
   AliMUONTriggerCircuit& operator=(const AliMUONTriggerCircuit& AliMUONTriggerCircuit); 
 
   //--- methods which return member data related info
+  Float_t GetX11Pos(Int_t localBoardId, Int_t istrip) const;
   Float_t GetY11Pos(Int_t localBoardId, Int_t istrip) const;
   Float_t GetY21Pos(Int_t localBoardId, Int_t istrip) const;
-  Float_t GetX11Pos(Int_t localBoardId, Int_t istrip) const;
+  Float_t GetZ11Pos(Int_t localBoardId, Int_t istrip) const;
+  Float_t GetZ21Pos(Int_t localBoardId, Int_t istrip) const;
+  Float_t GetX11Width(Int_t localBoardId, Int_t istrip) const;
+  Float_t GetY11Width(Int_t localBoardId, Int_t istrip) const;
+  Float_t GetY21Width(Int_t localBoardId, Int_t istrip) const;
 
   //  void Print(Option_t* opt="") const;
   //  void dump(const char* what, const Float_t* array, Int_t size);
   //  void dump(const char* what, const Int_t* array, Int_t size);
   
   /// Set pointer to transformations
-  void  SetTransformer(const AliMUONGeometryTransformer* transformer) {fTransformer = transformer;}
+  void  SetTransformer(const AliMUONGeometryTransformer* transformer) {fkTransformer = transformer;}
   /// Get pointer to transformations
-  const AliMUONGeometryTransformer* GetTransformer() const {return fTransformer;}
+  const AliMUONGeometryTransformer* GetTransformer() const {return fkTransformer;}
   Float_t PtCal(Int_t localBoardId, Int_t istripX, Int_t idev, Int_t istripY) const;
   
 private:
 
-  void LoadYPos(AliMpLocalBoard* localBoard);
-  void LoadXPos(AliMpLocalBoard* localBoard);
+  void LoadYPos(AliMpLocalBoard* const localBoard);
+  void LoadXPos(AliMpLocalBoard* const localBoard);
 
   Int_t FirstStrip(AliMpLocalBoard* localBoard);
 
   void FillXstrips(const Int_t icol, 
                    const Int_t iFirstStrip, const Int_t iLastStrip,
-                   Int_t liStripCircuit, TArrayF& ypos);
+                   Int_t liStripCircuit, const Bool_t is11);
   
   void FillYstrips(const Int_t iFirstStrip,
                    const Int_t iLastStrip, Int_t liStripCircuit,
@@ -69,13 +73,18 @@ private:
   TArrayF fXpos11[235];         ///< X position of Y strips in MC11
   TArrayF fYpos11[235];         ///< Y position of X strips in MC11
   TArrayF fYpos21[235];         ///< Y position of X strips in MC21
+  TArrayF fZpos11[235];         ///< Z position of X strips in MC11
+  TArrayF fZpos21[235];         ///< Z position of X strips in MC21
+  TArrayF fXwidth11[235];         ///< width of Y strips in MC11
+  TArrayF fYwidth11[235];         ///< width of X strips in MC11
+  TArrayF fYwidth21[235];         ///< width of X strips in MC21
 
-  const AliMUONGeometryTransformer* fTransformer; //!< pointer to transformation
-  const AliMpVSegmentation* fCurrentSeg;          //!< current segmentation
+  const AliMUONGeometryTransformer* fkTransformer; //!< pointer to transformation
+  const AliMpVSegmentation* fkCurrentSeg;          //!< current segmentation
 
   Int_t fCurrentDetElem;                          //!< current detection elt id
   Int_t fCurrentLocalBoard;                       //!< current local board id
 
-  ClassDef(AliMUONTriggerCircuit,1) // Trigger Circuit class
+  ClassDef(AliMUONTriggerCircuit,2) // Trigger Circuit class
 };
 #endif