- fixing use of centrality class

[u/mrichter/AliRoot.git] / VZERO / AliVZEROTriggerData.h

diff --git a/VZERO/AliVZEROTriggerData.h b/VZERO/AliVZEROTriggerData.h
index c83b968408b0966cd2b8ad078d7553d7c001b9d8..0f49a0c990f91d12da74a68624c0e080ae5ac50e 100644 (file)
--- a/VZERO/AliVZEROTriggerData.h
+++ b/VZERO/AliVZEROTriggerData.h
@@ -95,37 +95,37 @@ public:
        // ----- Getters -----\r
        \r
        UShort_t * GetClk1Win1() const {return (UShort_t*)fClk1Win1;};\r
-       UShort_t GetClk1Win1(Int_t board ) const {return (board<kNCIUBoards?fClk1Win1[board]:0);};\r
+       UShort_t GetClk1Win1(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fClk1Win1[board]:0);};\r
        UShort_t * GetClk2Win1() const {return (UShort_t*)fClk2Win1;};\r
-       UShort_t GetClk2Win1(Int_t board ) const {return (board<kNCIUBoards?fClk2Win1[board]:0);};\r
+       UShort_t GetClk2Win1(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fClk2Win1[board]:0);};\r
 \r
        UShort_t * GetClk1Win2() const {return (UShort_t*)fClk1Win2;};\r
-       UShort_t GetClk1Win2(Int_t board ) const {return (board<kNCIUBoards?fClk1Win2[board]:0);};\r
+       UShort_t GetClk1Win2(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fClk1Win2[board]:0);};\r
        UShort_t * GetClk2Win2() const {return (UShort_t*)fClk2Win2;};\r
-       UShort_t GetClk2Win2(Int_t board ) const {return (board<kNCIUBoards?fClk2Win2[board]:0);};\r
+       UShort_t GetClk2Win2(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fClk2Win2[board]:0);};\r
 \r
        UShort_t * GetDelayClk1Win1() const {return (UShort_t*)fDelayClk1Win1;};\r
-       UShort_t GetDelayClk1Win1(Int_t board ) const {return (board<kNCIUBoards?fDelayClk1Win1[board]:0);};\r
+       UShort_t GetDelayClk1Win1(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fDelayClk1Win1[board]:0);};\r
        UShort_t * GetDelayClk2Win1() const {return (UShort_t*)fDelayClk2Win1;};\r
-       UShort_t GetDelayClk2Win1(Int_t board ) const {return (board<kNCIUBoards?fDelayClk2Win1[board]:0);};\r
+       UShort_t GetDelayClk2Win1(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fDelayClk2Win1[board]:0);};\r
        \r
        UShort_t * GetDelayClk1Win2() const {return (UShort_t*)fDelayClk1Win2;};\r
-       UShort_t GetDelayClk1Win2(Int_t board ) const {return (board<kNCIUBoards?fDelayClk1Win2[board]:0);};\r
+       UShort_t GetDelayClk1Win2(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fDelayClk1Win2[board]:0);};\r
        UShort_t * GetDelayClk2Win2() const {return (UShort_t*)fDelayClk2Win2;};\r
-       UShort_t GetDelayClk2Win2(Int_t board ) const {return (board<kNCIUBoards?fDelayClk2Win2[board]:0);};\r
+       UShort_t GetDelayClk2Win2(Int_t board ) const {return ((board>=0 && board<kNCIUBoards)?fDelayClk2Win2[board]:0);};\r
        \r
        UShort_t * GetLatchWin1() const {return (UShort_t*)fLatchWin1;};\r
-       UShort_t GetLatchWin1(Int_t board ) const  {return (board<kNCIUBoards?fLatchWin1[board]:0);};\r
+       UShort_t GetLatchWin1(Int_t board ) const  {return ((board>=0 && board<kNCIUBoards)?fLatchWin1[board]:0);};\r
        UShort_t * GetLatchWin2() const {return (UShort_t*)fLatchWin2;};\r
-       UShort_t GetLatchWin2(Int_t board ) const  {return (board<kNCIUBoards?fLatchWin2[board]:0);};\r
+       UShort_t GetLatchWin2(Int_t board ) const  {return ((board>=0 && board<kNCIUBoards)?fLatchWin2[board]:0);};\r
        \r
        UShort_t * GetResetWin1() const {return (UShort_t*)fResetWin1;};\r
-       UShort_t GetResetWin1(Int_t board ) const  {return (board<kNCIUBoards?fResetWin1[board]:0);};\r
+       UShort_t GetResetWin1(Int_t board ) const  {return ((board>=0 && board<kNCIUBoards)?fResetWin1[board]:0);};\r
        UShort_t * GetResetWin2() const {return (UShort_t*)fResetWin2;};\r
-       UShort_t GetResetWin2(Int_t board ) const  {return (board<kNCIUBoards?fResetWin2[board]:0);};\r
+       UShort_t GetResetWin2(Int_t board ) const  {return ((board>=0 && board<kNCIUBoards)?fResetWin2[board]:0);};\r
        \r
        Bool_t * GetPedestalSubtraction() const {return (Bool_t*) fPedestalSubtraction;};\r
-       Bool_t GetPedestalSubtraction(Int_t board ) const  {return (board<kNCIUBoards?fPedestalSubtraction[board]:0);};\r
+       Bool_t GetPedestalSubtraction(Int_t board ) const  {return ((board>=0 && board<kNCIUBoards)?fPedestalSubtraction[board]:0);};\r
 \r
        UShort_t GetBBAThreshold() const {return fBBAThreshold;};\r
        UShort_t GetBBCThreshold() const {return fBBCThreshold;};\r
@@ -148,7 +148,7 @@ public:
        UShort_t GetMultV0CThrLow() const {return fMultV0CThrLow;};\r
        UShort_t GetMultV0CThrHigh() const {return fMultV0CThrHigh;};\r
 \r
-       UShort_t GetTriggerSelected(Int_t output) const {return (output<kNTriggerOutputs?fTriggerSelected[output]:0);};\r
+       UShort_t GetTriggerSelected(Int_t output) const {return ((output>=0 && output<kNTriggerOutputs)?fTriggerSelected[output]:0);};\r
        \r
        Bool_t GetEnableCharge(Int_t board, Int_t channel);\r
        Bool_t GetEnableTiming(Int_t board, Int_t channel);\r
@@ -212,7 +212,7 @@ private:
        Bool_t fIsProcessed; // bool to know processing status\r
        \r
        Bool_t  IsClkValid(UShort_t clock) const;\r
-       void SetParameter(TString name, Float_t val);\r
+       void SetParameter(TString name, Int_t val);\r
        \r
        \r
        ClassDef( AliVZEROTriggerData, 2 )  \r