From: cblume Date: Thu, 15 Oct 2009 08:18:41 +0000 (+0000) Subject: Fix compiler warnings X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=4f9b0c9089656399764c60c95b8caedd4197ce08;p=u%2Fmrichter%2FAliRoot.git Fix compiler warnings --- diff --git a/TRD/AliTRDQAChecker.h b/TRD/AliTRDQAChecker.h index 283e4b43f47..d655f63bf89 100644 --- a/TRD/AliTRDQAChecker.h +++ b/TRD/AliTRDQAChecker.h @@ -25,6 +25,8 @@ class TObjArray; // --- AliRoot header files --- #include "AliQAv1.h" #include "AliQACheckerBase.h" + +class AliDetectorRecoParam; class AliTRDLoader ; class AliTRDQAChecker: public AliQACheckerBase { @@ -37,6 +39,8 @@ public: virtual Double_t * Check(TList * /*list*/) {return NULL;} virtual Double_t * Check(AliQAv1::ALITASK_t /*index*/, TObjArray ** /*list*/); virtual Double_t * Check(AliQAv1::ALITASK_t /*index*/, TNtupleD** /*nt*/) {return NULL;} + virtual Double_t * Check(AliQAv1::ALITASK_t /*index*/, AliDetectorRecoParam* /*param*/) {return NULL;} + virtual Double_t * Check(AliQAv1::ALITASK_t /*index*/, TObjArray** /*list*/, AliDetectorRecoParam* /*param*/) {return NULL;} private: diff --git a/TRD/AliTRDrawStream.cxx b/TRD/AliTRDrawStream.cxx index fc3589cb1d1..1148d0479ea 100644 --- a/TRD/AliTRDrawStream.cxx +++ b/TRD/AliTRDrawStream.cxx @@ -673,7 +673,7 @@ Bool_t AliTRDrawStream::Next() } //------------------------------------------------------------ -Int_t AliTRDrawStream::NextChamber(AliTRDdigitsManager *const digitsManager, UInt_t **trackletContainer, UShort_t **errorCodeContainer) +Int_t AliTRDrawStream::NextChamber(AliTRDdigitsManager *const digitsManager, UInt_t **trackletContainer, UShort_t **/*errorCodeContainer*/) { // // Fills single chamber digit array diff --git a/TRD/AliTRDrecoParam.cxx b/TRD/AliTRDrecoParam.cxx index 3d869dba9bf..c55a584a422 100644 --- a/TRD/AliTRDrecoParam.cxx +++ b/TRD/AliTRDrecoParam.cxx @@ -59,7 +59,7 @@ AliTRDrecoParam::AliTRDrecoParam() ,fkTrackLikelihood(-15.) ,fFlags(0) ,fRawStreamVersion("REAL") - ,fADCBaseline(0.) + ,fADCBaseline(0) ,fMinMaxCutSigma(4.) ,fMinLeftRightCutSigma(8.) ,fClusMaxThresh(4.5) diff --git a/TRD/Cal/AliTRDCalPIDLQ.cxx b/TRD/Cal/AliTRDCalPIDLQ.cxx index 85d970d8e70..3fe4db97a84 100644 --- a/TRD/Cal/AliTRDCalPIDLQ.cxx +++ b/TRD/Cal/AliTRDCalPIDLQ.cxx @@ -88,6 +88,7 @@ Bool_t AliTRDCalPIDLQ::LoadPDF(TDirectoryFile *d) fModel->AddAt(pdf->Clone(), GetModelID(ip, is, 0)); } } + return kTRUE; } // //_________________________________________________________________________ diff --git a/TRD/qaRec/AliTRDpidRefMaker.h b/TRD/qaRec/AliTRDpidRefMaker.h index f962c6c16da..5e32e0efeb3 100644 --- a/TRD/qaRec/AliTRDpidRefMaker.h +++ b/TRD/qaRec/AliTRDpidRefMaker.h @@ -78,7 +78,7 @@ protected: ETRDpidRefMakerSource fRefP; // reference momentum source Float_t fTrainFreq; //! training sample relative abundance Float_t fTestFreq; //! testing sample relative abundance - UChar_t fLy; //! TRD layer + Char_t fLy; //! TRD layer Float_t fP; //! momentum Float_t fdEdx[10]; //! dEdx array Float_t fPID[AliPID::kSPECIES]; //! pid from v0s @@ -87,7 +87,7 @@ private: AliTRDpidRefMaker(const AliTRDpidRefMaker&); // not implemented AliTRDpidRefMaker& operator=(const AliTRDpidRefMaker&); // not implemented - ClassDef(AliTRDpidRefMaker, 1); // TRD PID reference maker base class + ClassDef(AliTRDpidRefMaker, 2); // TRD PID reference maker base class }; #endif diff --git a/TRD/qaRec/AliTRDpidRefMakerLQ.cxx b/TRD/qaRec/AliTRDpidRefMakerLQ.cxx index 71bec15848b..ae434ad79d5 100644 --- a/TRD/qaRec/AliTRDpidRefMakerLQ.cxx +++ b/TRD/qaRec/AliTRDpidRefMakerLQ.cxx @@ -285,11 +285,11 @@ Bool_t AliTRDpidRefMakerLQ::PostProcess() for(int iy=1; iy<=ay->GetNbins(); iy++){ rxy[1] = ay->GetBinCenter(iy); - Double_t r,e; - pdf.Eval(rxy, r, e); - if(r<0. || e/r>.15) continue; // 15% relative error - //printf("x[%2d] x[%2d] r[%f] e[%f]\n", ix, iy, r, e); - h2s->SetBinContent(ix, iy, r); + Double_t rr,ee; + pdf.Eval(rxy, rr, ee); + if(rr<0. || ee/rr>.15) continue; // 15% relative error + //printf("x[%2d] x[%2d] r[%f] e[%f]\n", ix, iy, rr, ee); + h2s->SetBinContent(ix, iy, rr); } } diff --git a/TRD/qaRec/AliTRDpidRefMakerLQ.h b/TRD/qaRec/AliTRDpidRefMakerLQ.h index 387f506a367..38a21c2a7de 100644 --- a/TRD/qaRec/AliTRDpidRefMakerLQ.h +++ b/TRD/qaRec/AliTRDpidRefMakerLQ.h @@ -48,11 +48,11 @@ private: AliTRDpidRefMakerLQ& operator=(const AliTRDpidRefMakerLQ &ref); private: - UChar_t fPbin; //! momentum bin - UChar_t fSbin; //! species bin + Char_t fPbin; //! momentum bin + Char_t fSbin; //! species bin TObjArray *fResults; //! array to store PDF representation - ClassDef(AliTRDpidRefMakerLQ, 4) // Reference builder for Multidim-LQ TRD-PID + ClassDef(AliTRDpidRefMakerLQ, 5) // Reference builder for Multidim-LQ TRD-PID }; diff --git a/TRD/qaRec/info/AliTRDv0Info.cxx b/TRD/qaRec/info/AliTRDv0Info.cxx index 87f86866734..46dee842965 100644 --- a/TRD/qaRec/info/AliTRDv0Info.cxx +++ b/TRD/qaRec/info/AliTRDv0Info.cxx @@ -222,9 +222,9 @@ Double_t AliTRDv0Info::InvMass(Int_t part1, Int_t part2, AliESDv0 *esdv0) (mn[2]+mp[2])*(mn[2]+mp[2]); //invariant mass : - Double_t InvMass = TMath::Sqrt((e1+e2)*(e1+e2)-momsum); + Double_t mInv = TMath::Sqrt((e1+e2)*(e1+e2)-momsum); - return InvMass; + return mInv; } //_________________________________________________