X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONLocalStruct.h;h=84620b5e2e7f3176e0e0eb0df8e90143d1177207;hb=91870222f85b1ba7bd535116951c2fa7abc099e0;hp=6ffb2440ee5a8ac864a25e19bc963b393b3cb702;hpb=78649106ec7f71baeb897efa54274a4011675b87;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONLocalStruct.h b/MUON/AliMUONLocalStruct.h
index 6ffb2440ee5..84620b5e2e7 100644
--- a/MUON/AliMUONLocalStruct.h
+++ b/MUON/AliMUONLocalStruct.h
@@ -7,12 +7,14 @@
 
 /// \ingroup raw
 /// \class AliMUONLocalStruct
-/// \brief rawdata local card structure for trigger
+/// \brief Rawdata local card structure for trigger
 ///
 //  Author Christian Finck
 
 #include <TObject.h>
 #include <TMath.h>
+#include <TArrayS.h>
+
 
 class AliMUONLocalStruct : public TObject{
  
@@ -22,68 +24,112 @@ public:
    AliMUONLocalStruct& operator=(const AliMUONLocalStruct& event);
 
 
-   virtual ~AliMUONLocalStruct(){;}
+   virtual ~AliMUONLocalStruct();
 
    // local board info
+            /// Return local data
    UInt_t  GetData(Int_t n) const {return fData[n];}
 
+            /// Return X2
    UShort_t GetX2() const {return (fData[0]     >> 16) &  0xFFFF;}
+            /// Return X1
    UShort_t GetX1() const {return (fData[0])           &  0xFFFF;}
+            /// Return X4
    UShort_t GetX4() const {return (fData[1] >> 16) &  0xFFFF;}
+            /// Return X3
    UShort_t GetX3() const {return (fData[1])       &  0xFFFF;}
+           /// return X pattern array
+   void    GetXPattern(TArrayS& array) const;
+           /// return Y pattern array
+   void    GetYPattern(TArrayS& array) const;
 
+            /// Return Y2
    UShort_t GetY2() const {return (fData[2] >> 16) &  0xFFFF;}
+            /// Return Y1
    UShort_t GetY1() const {return (fData[2])       &  0xFFFF;}
+            /// Return Y4
    UShort_t GetY4() const {return (fData[3] >> 16) &  0xFFFF;}
+            /// Return Y3
    UShort_t GetY3() const {return (fData[3])       &  0xFFFF;}
 
+            /// Return Id
    UChar_t  GetId()  const  {return fData[4] >> 19 &  0xF;}
+            /// Return Dec
    UChar_t  GetDec() const  {return fData[4] >> 15 &  0xF;}
-   Bool_t   GetTriggerY() const {return (fData[4] >> 14 & 0x1);}
+            /// Return TrigY
+   Bool_t   GetTrigY() const {return (fData[4] >> 14 & 0x1);}
+            /// Return TriggerY
+   Bool_t   GetTriggerY() const {return !(GetTrigY() && GetYPos()==15);}
+            /// Return Upos
    UChar_t  GetYPos() const {return fData[4] >> 10 &  0xF;}
-   UChar_t  GetXDev() const {return fData[4] >> 5  &  0x1F;}
-   Bool_t   GetTriggerX() const {return ((GetXDev() >> 4  & 0x1) && !(GetXDev() & 0xF));}
+            /// Get Sign of X deviation 
+   UChar_t  GetSXDev() const {return fData[4] >> 9  &  0x1;}
+            /// Get X deviation 
+   UChar_t  GetXDev() const {return fData[4] >> 5  &  0xF;}
+            /// Return TriggerX
+   Bool_t   GetTriggerX() const {return !(GetSXDev() &&
+					  !GetXDev() &&
+					  GetXPos()==0);}   
+            /// Return Xpos
    UChar_t  GetXPos() const {return fData[4]       &  0x1F;}
 
+            /// Return LPT
    Int_t   GetLpt() const {return (GetDec() & 0x3);}
+            /// Return HPT
    Int_t   GetHpt() const {return (GetDec() >> 2) & 0x3;}
 
+            /// Set local data
    void    SetData(UInt_t d, Int_t n) {fData[n] = d;}
 
+            /// Return data
    UInt_t* GetData() {return &fData[0];}
 
  // Scaler methods
+            /// Return local L0
    UInt_t  GetL0()      const {return fL0;}
+            /// Return local hold (dead time)
    UInt_t  GetHold()    const {return fHold;}
+            /// Return local clock
    UInt_t  GetClock()   const {return fClk;}
-   UChar_t GetSwitch()  const {return (fEOS >> 2) & 0x3FF;}
-   UChar_t GetComptXY() const {return  fEOS & 3;}
+            /// Return switch
+   UShort_t GetSwitch()  const {return (fEOS >> 1) & 0x3FF;}
+            /// Return ComptXY
+   UChar_t GetComptXY() const {return  fEOS & 1;}
 
-   UShort_t GetXY1(Int_t n) const {return  (n % 2 == 0) ?
+            /// Return XY1
+   UShort_t GetXY1(Int_t n) const {return  (n % 2 == 1) ?
        (fScaler[TMath::Nint(Float_t(n/2))] &  0xFFFF) : 
        (fScaler[TMath::Nint(Float_t(n/2))] >> 16) &  0xFFFF;}
 
-   UShort_t GetXY2(Int_t n) const {return  (n % 2 == 0) ?
+            /// Return XY2
+   UShort_t GetXY2(Int_t n) const {return  (n % 2 == 1) ?
        (fScaler[8 + TMath::Nint(Float_t(n/2))] &  0xFFFF) : 
        (fScaler[8 + TMath::Nint(Float_t(n/2))] >> 16) &  0xFFFF;}
 
-   UShort_t GetXY3(Int_t n) const {return  (n % 2 == 0) ?
+            /// Return XY3
+   UShort_t GetXY3(Int_t n) const {return  (n % 2 == 1) ?
        (fScaler[8*2 + TMath::Nint(Float_t(n/2))] &  0xFFFF) : 
        (fScaler[8*2 + TMath::Nint(Float_t(n/2))] >> 16) &  0xFFFF;}
 
-   UShort_t GetXY4(Int_t n) const {return  (n % 2 == 0) ?
+            /// Return XY4
+   UShort_t GetXY4(Int_t n) const {return  (n % 2 == 1) ?
        (fScaler[8*3 + TMath::Nint(Float_t(n/2))] &  0xFFFF) : 
        (fScaler[8*3 + TMath::Nint(Float_t(n/2))] >> 16) &  0xFFFF;}
 
+            /// Return scalers
    UInt_t* GetScalers()  {return &fL0;} 
 
    // get  length
+            /// Return scaler length in word
    Int_t  GetScalerLength()  const {return fgkScalerLength;} 
+            /// Return local info length in word
    Int_t  GetLength()        const {return fgkLength;} 
+            /// Return end of local info word
    UInt_t GetEndOfLocal()    const {return fgkEndOfLocal;}
+            /// Return Word for "empty" slots
    UInt_t GetDisableWord()   const {return fgkDisableWord;}
 
-  // set random numbers to fill variable
+   // set random numbers to fill variable
    void SetScalersNumbers();
 
  private:
@@ -117,6 +163,6 @@ public:
    static const UInt_t fgkEndOfLocal;   ///< end of local info word
    static const UInt_t fgkDisableWord;  ///< Word for "empty" slots
 
-   ClassDef(AliMUONLocalStruct,3)
+   ClassDef(AliMUONLocalStruct,3) //Rawdata local card structure for trigger
 };
 #endif