X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONLocalStruct.h;h=84620b5e2e7f3176e0e0eb0df8e90143d1177207;hb=de88b926deb10255346baf8513f0a20e345726d5;hp=5d5dedf38c9304a195ed078da5f63c1e3ba3fd0c;hpb=7c97cbb13e02895fdf433a370a126d3cdeaef0f6;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONLocalStruct.h b/MUON/AliMUONLocalStruct.h index 5d5dedf38c9..84620b5e2e7 100644 --- a/MUON/AliMUONLocalStruct.h +++ b/MUON/AliMUONLocalStruct.h @@ -7,7 +7,7 @@ /// \ingroup raw /// \class AliMUONLocalStruct -/// \brief rawdata local card structure for trigger +/// \brief Rawdata local card structure for trigger /// // Author Christian Finck @@ -92,27 +92,27 @@ public: /// Return local clock UInt_t GetClock() const {return fClk;} /// Return switch - UChar_t GetSwitch() const {return (fEOS >> 2) & 0x3FF;} + UShort_t GetSwitch() const {return (fEOS >> 1) & 0x3FF;} /// Return ComptXY - UChar_t GetComptXY() const {return fEOS & 3;} + UChar_t GetComptXY() const {return fEOS & 1;} /// Return XY1 - UShort_t GetXY1(Int_t n) const {return (n % 2 == 0) ? + 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;} /// Return XY2 - UShort_t GetXY2(Int_t n) const {return (n % 2 == 0) ? + 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;} /// Return XY3 - UShort_t GetXY3(Int_t n) const {return (n % 2 == 0) ? + 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;} /// Return XY4 - UShort_t GetXY4(Int_t n) const {return (n % 2 == 0) ? + 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;} @@ -163,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