From: decaro Date: Mon, 13 Sep 2010 14:13:59 +0000 (+0000) Subject: Warning fixed X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=4492324eddaa1388f9898785426c4c5c82040c6c;p=u%2Fmrichter%2FAliRoot.git Warning fixed --- diff --git a/TOF/AliTOFFEEConfig.h b/TOF/AliTOFFEEConfig.h index f54e32ed7b5..a264306dd9c 100644 --- a/TOF/AliTOFFEEConfig.h +++ b/TOF/AliTOFFEEConfig.h @@ -229,7 +229,7 @@ class AliTOFFEEConfig Int_t GetRunNumber() const {return fRunNumber;}; // get run number Int_t GetRunType() const {return fRunType;}; // get run type Int_t GetBytes() const {return fBytes;}; // get bytes - Int_t GetCTTMTriggerMask(UShort_t iCrate) const {return iCrate < GetNumberOfCrates() ? fCTTMTriggerMask[iCrate] : NULL;}; // get CTTM trigger mask + Int_t GetCTTMTriggerMask(UShort_t iCrate) const {return iCrate < GetNumberOfCrates() ? fCTTMTriggerMask[iCrate] : 0;}; // get CTTM trigger mask AliTOFCrateConfig *GetCrateConfig(UShort_t iCrate) {return iCrate < GetNumberOfCrates() ? &fCrateConfig[iCrate] : NULL;}; // get crate config }; diff --git a/TOF/AliTOFTrigger.cxx b/TOF/AliTOFTrigger.cxx index 22acbc05f5d..1cf2befc2c5 100644 --- a/TOF/AliTOFTrigger.cxx +++ b/TOF/AliTOFTrigger.cxx @@ -672,7 +672,7 @@ void AliTOFTrigger::SetBit(Int_t *detind) if(index[0]<36) fCTTMmatrixFront[index[0]][index[1]]=kTRUE; else - fCTTMmatrixBack[index[0]][index[1]]=kTRUE; + fCTTMmatrixBack[index[0]-36][index[1]]=kTRUE; } @@ -709,7 +709,7 @@ void AliTOFTrigger::SetBit(Int_t nDDL, Int_t nTRM, Int_t iChain, if (index[0]<36) fCTTMmatrixFront[index[0]][index[1]]=kTRUE; else - fCTTMmatrixBack[index[0]][index[1]]=kTRUE; + fCTTMmatrixBack[index[0]-36][index[1]]=kTRUE; // AdC } else AliError("Call this function only if(nTRM==3 && iTDC>12 && iTDC<14 && nDDL%2==1) "); @@ -728,7 +728,7 @@ void AliTOFTrigger::ResetBit(Int_t *detind) if(index[0]<36) fCTTMmatrixFront[index[0]][index[1]]=kFALSE; else - fCTTMmatrixBack[index[0]][index[1]]=kFALSE; + fCTTMmatrixBack[index[0]-36][index[1]]=kFALSE; // AdC } @@ -765,7 +765,7 @@ void AliTOFTrigger::ResetBit(Int_t nDDL, Int_t nTRM, Int_t iChain, if (index[0]<36) fCTTMmatrixFront[index[0]][index[1]]=kFALSE; else - fCTTMmatrixBack[index[0]][index[1]]=kFALSE; + fCTTMmatrixBack[index[0]-36][index[1]]=kFALSE; // AdC } else AliError("Call this function only if(nTRM==3 && iTDC>12 && iTDC<14 && nDDL%2==1) "); @@ -781,7 +781,7 @@ Bool_t AliTOFTrigger::GetBit(Int_t *detind) Int_t index[2]; GetCTTMIndex(detind,index); - return (index[0]<36)?fCTTMmatrixFront[index[0]][index[1]]:fCTTMmatrixBack[index[0]][index[1]]; + return (index[0]<36)?fCTTMmatrixFront[index[0]][index[1]]:fCTTMmatrixBack[index[0]-36][index[1]]; // AdC } @@ -823,7 +823,7 @@ Bool_t AliTOFTrigger::GetBit(Int_t nDDL, Int_t nTRM, Int_t iChain, iLTMindex++; iChannelindex=iCH+iTDC*AliTOFGeometry::NCh()-12*AliTOFGeometry::NCh(); Int_t index[2]={iLTMindex,iChannelindex}; - return (index[0]<36)?fCTTMmatrixFront[index[0]][index[1]]:fCTTMmatrixBack[index[0]][index[1]]; + return (index[0]<36)?fCTTMmatrixFront[index[0]][index[1]]:fCTTMmatrixBack[index[0]-36][index[1]]; // AdC }