From: fnoferin Date: Thu, 17 Nov 2011 11:32:15 +0000 (+0000) Subject: warning fix X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=777fcfdefff33ea58f08f3bb05cf22c85cbec2ea;ds=sidebyside warning fix --- diff --git a/TOF/AliTOFT0maker.cxx b/TOF/AliTOFT0maker.cxx index f4e6d06cc5b..220ed3d919c 100644 --- a/TOF/AliTOFT0maker.cxx +++ b/TOF/AliTOFT0maker.cxx @@ -43,7 +43,6 @@ // // ///////////////////////////////////////////////////////////////////////////// -#include "AliTOFT0v1.h" #include "AliTOFT0maker.h" #include "AliPID.h" #include "AliLog.h" @@ -367,7 +366,7 @@ void AliTOFT0maker::ApplyT0TOF(AliESDEvent *esd){ // } //____________________________________________________________________________ -void AliTOFT0maker::LoadChannelMap(char *filename){ +void AliTOFT0maker::LoadChannelMap(const char *filename){ // Load the histo with the channel off map TFile *f= new TFile(filename); if(!f){ diff --git a/TOF/AliTOFT0maker.h b/TOF/AliTOFT0maker.h index 6086fe6f37a..b94fc394a00 100644 --- a/TOF/AliTOFT0maker.h +++ b/TOF/AliTOFT0maker.h @@ -14,12 +14,12 @@ #include "TObject.h" +#include "AliTOFT0v1.h" class TH1F; class AliESDEvent; class AliESDpid; -class AliTOFT0v1; class AliTOFcalib; class AliTOFT0maker : public TObject { @@ -39,7 +39,7 @@ public: Double_t GetTimeResolution() const {return fTimeResolution;} // Get TOF Time Resolution void SetT0FillWidth(Float_t width){if(width > 50) fT0width = width; else fT0width=150;}; // in ps - void LoadChannelMap(char *filename="$ALICE_ROOT/TOF/enableMap.104892.root"); //load the enable channel map + void LoadChannelMap(const char *filename="$ALICE_ROOT/TOF/enableMap.104892.root"); //load the enable channel map void ApplyMask(AliESDEvent * const esd); // Apply the channel mask void SetNoTOFT0(Bool_t status=kTRUE){fNoTOFT0=status;}; // disable the TOF T0 info @@ -54,6 +54,8 @@ public: void WriteInESD(AliESDEvent *esd); + Int_t GetPileUpCandidate(){return fT0TOF->GetPileUpCandidate();}; + private: AliTOFT0maker(const AliTOFT0maker &);