From 8e8eae84c82d2951bab0d875cdd742d409f5b196 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 4 Feb 2004 18:32:15 +0000 Subject: [PATCH] Removing warnings (Sun) --- CONTAINERS/AliSegmentArray.cxx | 4 +-- CONTAINERS/AliSegmentArray.h | 4 +-- CRT/AliGenCRT.cxx | 2 +- EMCAL/AliEMCALJetFinder.cxx | 10 ++++---- EMCAL/AliEMCALJetFinder.h | 16 ++++++------ EMCAL/AliEMCALJetMicroDst.cxx | 4 +-- EMCAL/AliEMCALJetMicroDst.h | 6 ++--- EMCAL/AliEMCALPID.h | 2 +- EMCAL/AliEMCALPIDv1.h | 2 +- HBTAN/volya_complex.h | 4 +-- ITS/AliITS.cxx | 10 ++++---- ITS/AliITS.h | 10 ++++---- ITS/AliITSDigitizer.cxx | 2 +- ITS/AliITSVertex.cxx | 8 +++--- ITS/AliITSVertex.h | 8 +++--- ITS/AliITStrackerSA.cxx | 4 +-- ITS/AliITStrackerSA.h | 4 +-- ITS/AliITSvPPRasymmFMD.cxx | 4 +-- ITS/AliITSvSPD02.cxx | 2 +- ITS/AliITSvtest.cxx | 2 +- MUON/AliMUONv3.cxx | 4 +-- PHOS/AliPHOSPID.h | 2 +- PHOS/AliPHOSPIDv0.cxx | 2 +- PHOS/AliPHOSPIDv0.h | 6 ++--- PHOS/AliPHOSPIDv1.h | 2 +- PHOS/AliPHOSvImpacts.cxx | 2 +- PHOS/AliPHOSvImpacts.h | 2 +- RALICE/AliAttribObj.cxx | 2 +- RALICE/AliAttribObj.h | 2 +- RALICE/AliCalmodule.cxx | 2 +- RALICE/AliCalmodule.h | 2 +- RALICE/AliCalorimeter.cxx | 2 +- RALICE/AliCalorimeter.h | 2 +- RALICE/AliEvent.cxx | 2 +- RALICE/AliEvent.h | 2 +- RALICE/AliJet.cxx | 2 +- RALICE/AliJet.h | 2 +- RALICE/AliSignal.cxx | 2 +- RALICE/AliSignal.h | 2 +- RALICE/AliTrack.cxx | 2 +- RALICE/AliTrack.h | 2 +- RALICE/AliVertex.cxx | 2 +- RALICE/AliVertex.h | 2 +- RICH/AliRICHv0.cxx | 2 +- TOF/AliTOFReconstructionerV2.cxx | 4 +-- TOF/AliTOFReconstructionerV2.h | 2 +- TPC/AliClustersArray.cxx | 2 +- TPC/AliClustersArray.h | 2 +- TPC/AliTPCtrackerParam.cxx | 42 ++++++++++++++++---------------- TRD/AliTRDsegmentArray.cxx | 2 +- TRD/AliTRDsegmentArray.h | 2 +- TRD/AliTRDsegmentArrayBase.cxx | 4 +-- TRD/AliTRDsegmentArrayBase.h | 4 +-- TRD/AliTRDsimpleMC.cxx | 2 +- 54 files changed, 114 insertions(+), 114 deletions(-) diff --git a/CONTAINERS/AliSegmentArray.cxx b/CONTAINERS/AliSegmentArray.cxx index 24e0d1da0f1..cce3e88764b 100644 --- a/CONTAINERS/AliSegmentArray.cxx +++ b/CONTAINERS/AliSegmentArray.cxx @@ -55,7 +55,7 @@ AliSegmentArray::AliSegmentArray() fTreeOwner = kFALSE; } -AliSegmentArray::AliSegmentArray(Text_t *classname, Int_t n) +AliSegmentArray::AliSegmentArray(const char *classname, Int_t n) { // //constructor which @@ -111,7 +111,7 @@ AliSegmentArray::~AliSegmentArray() } -Bool_t AliSegmentArray::SetClass(Text_t *classname) +Bool_t AliSegmentArray::SetClass(const char *classname) { // //set class of stored object diff --git a/CONTAINERS/AliSegmentArray.h b/CONTAINERS/AliSegmentArray.h index 24faeed0655..ac081038ecc 100644 --- a/CONTAINERS/AliSegmentArray.h +++ b/CONTAINERS/AliSegmentArray.h @@ -23,9 +23,9 @@ class AliSegmentID; class AliSegmentArray: public TNamed{ public: AliSegmentArray(); - AliSegmentArray(Text_t *classname, Int_t n); // + AliSegmentArray(const char *classname, Int_t n); // virtual ~AliSegmentArray(); - Bool_t SetClass(Text_t *classname); //set class of stored object + Bool_t SetClass(const char *classname); //set class of stored object const AliSegmentID * At(Int_t i); //return pointer to segment with index i const AliSegmentID * operator[](Int_t i); //return pointer to segment with index i diff --git a/CRT/AliGenCRT.cxx b/CRT/AliGenCRT.cxx index da0893bebb7..cbd85fb4523 100644 --- a/CRT/AliGenCRT.cxx +++ b/CRT/AliGenCRT.cxx @@ -486,7 +486,7 @@ void AliGenCRT::InitZenithalAngleGeneration() this->InitApWeightFactors(); // Define the standard function. - char* zenithalDisributionFunction = "1 + [0]*(1 - cos(x*3.14159265358979312/180))"; + const char* zenithalDisributionFunction = "1 + [0]*(1 - cos(x*3.14159265358979312/180))"; Int_t pEnd = TMath::Abs(TMath::Nint(fPMax/fPResolution)) + 1; fPDist = new TClonesArray("TF1", pEnd); diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx index d438bc7d577..9054f39383d 100644 --- a/EMCAL/AliEMCALJetFinder.cxx +++ b/EMCAL/AliEMCALJetFinder.cxx @@ -1408,7 +1408,7 @@ Int_t AliEMCALJetFinder -void AliEMCALJetFinder::SaveBackgroundEvent(Char_t *name) +void AliEMCALJetFinder::SaveBackgroundEvent(const char *name) { // Saves the eta-phi lego and the tracklist and name of file with BG events // @@ -1632,19 +1632,19 @@ void hf1(Int_t& , Float_t& , Float_t& ) ; } -void AliEMCALJetFinder::DrawLego(Char_t *opt) +void AliEMCALJetFinder::DrawLego(const char *opt) { // Draw lego if(fLego) fLego->Draw(opt); } -void AliEMCALJetFinder::DrawLegoBackground(Char_t *opt) +void AliEMCALJetFinder::DrawLegoBackground(const char *opt) { // Draw background lego if(fLegoB) fLegoB->Draw(opt); } -void AliEMCALJetFinder::DrawLegoEMCAL(Char_t *opt) +void AliEMCALJetFinder::DrawLegoEMCAL(const char *opt) { // Draw EMCAL Lego if(fhLegoEMCAL) fhLegoEMCAL->Draw(opt); @@ -1763,7 +1763,7 @@ void AliEMCALJetFinder::DrawLegos() int1, int2, int3, int4, int1 - (int2 + int3 - int4)); } -const Char_t* AliEMCALJetFinder::GetFileNameForParameters(Char_t* dir) +const Char_t* AliEMCALJetFinder::GetFileNameForParameters(const char* dir) { // Get paramters from a file static TString tmp; diff --git a/EMCAL/AliEMCALJetFinder.h b/EMCAL/AliEMCALJetFinder.h index 198e2e40b45..f168282cd96 100644 --- a/EMCAL/AliEMCALJetFinder.h +++ b/EMCAL/AliEMCALJetFinder.h @@ -71,7 +71,7 @@ class AliEMCALJetFinder : public TTask { AliEMCALJet* GetJetT(Int_t n = 0) {return fJetT[n];} virtual void DrawHistsForTuning(Int_t mode=0); // *MENU* virtual void PrintParameters(Int_t mode=0); // *MENU* - virtual const Char_t* GetFileNameForParameters(Char_t* dir="RES/"); + virtual const Char_t* GetFileNameForParameters(const char* dir="RES/"); // Access to Results virtual Int_t Njets() const; @@ -94,13 +94,13 @@ class AliEMCALJetFinder : public TTask { Bool_t GetEnergyWeightingFlag() const {return fWeightingMethod ;} Float_t GetEMCALWeight() const {return fEMCALWeight;} Float_t GetTrackWeight() const {return fTrackWeight;} - void DrawLego(Char_t *opt="lego"); // *MENU* - void DrawLegoEMCAL(Char_t *opt="lego"); // *MENU* + void DrawLego(const char *opt="lego"); // *MENU* + void DrawLegoEMCAL(const char *opt="lego"); // *MENU* void DrawLegos(); // *MENU* - void DrawLegoBackground(Char_t *opt="lego"); // *MENU* + void DrawLegoBackground(const char *opt="lego"); // *MENU* Bool_t IsThisPartonsOrDiQuark(Int_t pdg); // I/O - virtual void SetOutputFileName(char* name) {fOutFileName = name;} + virtual void SetOutputFileName(const char* name) {fOutFileName = name;} virtual void FillFromHits(Int_t flag = 0); virtual void FillFromHitFlaggedTracks(Int_t flag = 0); virtual void FillFromDigits(Int_t flag = 0); @@ -108,13 +108,13 @@ class AliEMCALJetFinder : public TTask { virtual void FillFromParticles(); virtual void FillFromPartons(); - virtual void SaveBackgroundEvent(Char_t *name=""); + virtual void SaveBackgroundEvent(const char *name=""); virtual void InitFromBackground(); virtual void AddJet(const AliEMCALJet& jet); virtual void WriteJets(); virtual void ResetJets(); virtual TClonesArray* Jets() const {return fJets;} - const Char_t* GetNameOfVariant(); + const char* GetNameOfVariant(); virtual Bool_t IsFolder() const; virtual void Browse(TBrowser* b); @@ -196,7 +196,7 @@ class AliEMCALJetFinder : public TTask { Float_t fPrecBg; // max value of change for BG (in %) Int_t fError; // error variables - char* fOutFileName; //! Output file name + const char* fOutFileName; //! Output file name TFile* fOutFile; //! Output file TFile* fInFile; //! Output file Int_t fEvent; //! Processed event diff --git a/EMCAL/AliEMCALJetMicroDst.cxx b/EMCAL/AliEMCALJetMicroDst.cxx index 4c647068388..438702b1dcc 100644 --- a/EMCAL/AliEMCALJetMicroDst.cxx +++ b/EMCAL/AliEMCALJetMicroDst.cxx @@ -47,7 +47,7 @@ TString gAliNameTree("jetMDST"); // 7-feb-2002 extern "C" void sgpdge_(Int_t &i, Int_t &pdggea); -AliEMCALJetMicroDst::AliEMCALJetMicroDst(char *name, char *tit) : TNamed(name,tit) +AliEMCALJetMicroDst::AliEMCALJetMicroDst(const char *name, const char *tit) : TNamed(name,tit) { //constructor fFile = 0; @@ -742,7 +742,7 @@ Bool_t AliEMCALJetMicroDst::IsFolder() const else return kFALSE; } -TList* AliEMCALJetMicroDst::MoveHistsToList(char* name, Bool_t putToBrowser) +TList* AliEMCALJetMicroDst::MoveHistsToList(const char* name, Bool_t putToBrowser) { // Move HIST to list gROOT->cd(); diff --git a/EMCAL/AliEMCALJetMicroDst.h b/EMCAL/AliEMCALJetMicroDst.h index e15ef17dc02..fea92a0be03 100644 --- a/EMCAL/AliEMCALJetMicroDst.h +++ b/EMCAL/AliEMCALJetMicroDst.h @@ -26,8 +26,8 @@ class AliEMCALJetMicroDst: public TNamed { public: - AliEMCALJetMicroDst(char *name="jetMicroDst", - char *tit="jet Micro Dst for preparation of proposal"); + AliEMCALJetMicroDst(const char *name="jetMicroDst", + const char *tit="jet Micro Dst for preparation of proposal"); AliEMCALJetMicroDst(const AliEMCALJetMicroDst &) : TNamed("", ""){ Fatal("cpy ctor", "not implemented") ; } virtual ~AliEMCALJetMicroDst(); @@ -80,7 +80,7 @@ class AliEMCALJetMicroDst: public TNamed { virtual Bool_t IsFolder() const; virtual void Browse(TBrowser* b) const ; - static TList *MoveHistsToList(char* name="List of Hist", Bool_t putToBrowser=kTRUE); + static TList *MoveHistsToList(const char* name="List of Hist", Bool_t putToBrowser=kTRUE); AliEMCALJetMicroDst & operator = (const AliEMCALJetMicroDst &) { Fatal("operator =", "not implemented") ; return *this ; } diff --git a/EMCAL/AliEMCALPID.h b/EMCAL/AliEMCALPID.h index 9698e20db49..eb47285280b 100644 --- a/EMCAL/AliEMCALPID.h +++ b/EMCAL/AliEMCALPID.h @@ -42,7 +42,7 @@ class AliEMCALPID : public TTask { void SetEventFolderName(TString name) { fEventFolderName = name ; } virtual void SetPREtoECADistanceCut(Float_t, TString, Float_t) { Warning("SetCpvtoEmcDistanceCut", "not defined" ) ;} virtual void SetTimeGate(Float_t /*Cluster_En*/, TString /*Eff_Pur*/, Float_t /*gate*/) { Warning("SetTimeGate", "not defined" ) ; } - virtual char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } + virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } virtual void WriteRecParticles() = 0; private: diff --git a/EMCAL/AliEMCALPIDv1.h b/EMCAL/AliEMCALPIDv1.h index 3c6c11a4a74..1c61092b575 100644 --- a/EMCAL/AliEMCALPIDv1.h +++ b/EMCAL/AliEMCALPIDv1.h @@ -60,7 +60,7 @@ class AliEMCALPIDv1 : public AliEMCALPID { void Print() const ; - virtual char * Version() const { return "pid-v1" ; } + virtual const char * Version() const { return "pid-v1" ; } AliEMCALPIDv1 & operator = (const AliEMCALPIDv1 & /*pid*/) { return *this ;} diff --git a/HBTAN/volya_complex.h b/HBTAN/volya_complex.h index 71859843b3d..b96e69cebdd 100644 --- a/HBTAN/volya_complex.h +++ b/HBTAN/volya_complex.h @@ -30,13 +30,13 @@ Version 1.0.1 /////////////////////////// Helper Error Function -void ComplexError (char *msg) +void ComplexError (const char *msg) { cout << endl << msg << endl; exit (1); } -void ComplexWarning (char *msg) +void ComplexWarning (const char *msg) { cout << endl << msg << endl; } diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index d44865f0125..368ffa985da 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -730,7 +730,7 @@ void AliITS::InitModules(Int_t size,Int_t &nmodules){ } //______________________________________________________________________ void AliITS::FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules, - Option_t *option,Text_t *filename){ + Option_t *option, const char *filename){ // fill the modules with the sorted by module hits; add hits from // background if option=Add. // Inputs: @@ -1087,7 +1087,7 @@ void AliITS::Hits2Digits(){ } //______________________________________________________________________ void AliITS::HitsToSDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *option, Option_t *opt,Text_t *filename){ + Option_t *option, Option_t *opt, const char *filename){ // keep galice.root for signal and name differently the file for // background when add! otherwise the track info for signal will be lost ! // the condition below will disappear when the geom class will be @@ -1112,7 +1112,7 @@ void AliITS::HitsToSDigits(Int_t evNumber,Int_t bgrev,Int_t size, } //______________________________________________________________________ void AliITS::HitsToPreDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *option, Option_t *opt,Text_t *filename){ + Option_t *option, Option_t *opt, const char *filename){ // Keep galice.root for signal and name differently the file for // background when add! otherwise the track info for signal will be lost ! // the condition below will disappear when the geom class will be @@ -1176,7 +1176,7 @@ void AliITS::HitsToPreDigits(Int_t evNumber,Int_t bgrev,Int_t size, } //______________________________________________________________________ void AliITS::HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *option, Option_t *opt,Text_t *filename){ + Option_t *option, Option_t *opt, const char *filename){ // Keep galice.root for signal and name differently the file for // background when add! otherwise the track info for signal will be lost ! // the condition below will disappear when the geom class will be @@ -1605,7 +1605,7 @@ void AliITS::AddRecPoint(const AliITSRecPoint &r){ } //______________________________________________________________________ void AliITS::HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *opt0,Option_t *opt1,Text_t *flnm){ + Option_t *opt0,Option_t *opt1, const char *flnm){ // keep galice.root for signal and name differently the file for // background when add! otherwise the track info for signal will be lost ! // the condition below will disappear when the geom class will be diff --git a/ITS/AliITS.h b/ITS/AliITS.h index e0e892043d1..33a2cf494d0 100644 --- a/ITS/AliITS.h +++ b/ITS/AliITS.h @@ -107,7 +107,7 @@ class AliITS : public AliDetector { virtual void InitModules(Int_t size,Int_t &nmodules); virtual void FillModules(TTree *treeH, Int_t mask = 0); virtual void FillModules(Int_t evnt,Int_t bgrev,Int_t nmodules, - Option_t *opt,Text_t *filename); + Option_t *opt, const char *filename); virtual void ClearModules(); //===================== Digitisation =============================== @@ -127,13 +127,13 @@ class AliITS : public AliDetector { //------------------ Internal functions ---------------------------- // Standard Hits To SDigits function void HitsToSDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *add, Option_t *det, Text_t *filename); + Option_t *add, Option_t *det, const char *filename); // Standard Hits To SDigits function void HitsToPreDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *add, Option_t *det, Text_t *filename); + Option_t *add, Option_t *det, const char *filename); // Standard Hits To Digits function void HitsToDigits(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *add, Option_t *det, Text_t *filename); + Option_t *add, Option_t *det, const char *filename); void ResetSDigits(); // Resets the Summable digits. void ResetDigits(); // depending on how the void ResetDigits(Int_t branch); // tree will be filled only @@ -174,7 +174,7 @@ class AliITS : public AliDetector { void SetTreeAddressR(TTree *treeR); void AddRecPoint(const AliITSRecPoint &p); void HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size, - Option_t *add, Option_t *det, Text_t *filename); + Option_t *add, Option_t *det, const char *filename); void Digits2Reco(); void DigitsToRecPoints(Int_t evNumber,Int_t lastEntry,Option_t *det); void ResetRecPoints(); diff --git a/ITS/AliITSDigitizer.cxx b/ITS/AliITSDigitizer.cxx index c1fb2b47ca6..5112560cd01 100644 --- a/ITS/AliITSDigitizer.cxx +++ b/ITS/AliITSDigitizer.cxx @@ -138,7 +138,7 @@ void AliITSDigitizer::Exec(Option_t* opt){ // none. char name[20] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - char *all; + const char *all; const char *det[3] = {strstr(opt,"SPD"),strstr(opt,"SDD"), strstr(opt,"SSD")}; if( !det[0] && !det[1] && !det[2] ) all = "All"; diff --git a/ITS/AliITSVertex.cxx b/ITS/AliITSVertex.cxx index f61eb0d3885..d34a2b78845 100644 --- a/ITS/AliITSVertex.cxx +++ b/ITS/AliITSVertex.cxx @@ -40,7 +40,7 @@ AliITSVertex::AliITSVertex() { } //-------------------------------------------------------------------------- AliITSVertex::AliITSVertex(Double_t positionZ,Double_t sigmaZ, - Int_t nContributors,Char_t *vtxName) { + Int_t nContributors, const char *vtxName) { // // Constructor for vertex Z from pixels // @@ -56,7 +56,7 @@ AliITSVertex::AliITSVertex(Double_t positionZ,Double_t sigmaZ, //------------------------------------------------------------------------- AliITSVertex::AliITSVertex(Double_t phi, Double_t position[3],Double_t covmatrix[6], - Double_t chi2,Int_t nContributors,Char_t *vtxName) { + Double_t chi2,Int_t nContributors, const char *vtxName) { // // Constructor for vertex in 3D from tracks // @@ -82,7 +82,7 @@ AliITSVertex::AliITSVertex(Double_t phi, } //-------------------------------------------------------------------------- AliITSVertex::AliITSVertex(Double_t position[3],Double_t sigma[3], - Char_t *vtxName) { + const char *vtxName) { // // Constructor for smearing of true position // @@ -104,7 +104,7 @@ AliITSVertex::AliITSVertex(Double_t position[3],Double_t sigma[3], } //-------------------------------------------------------------------------- AliITSVertex::AliITSVertex(Double_t position[3],Double_t sigma[3], - Double_t snr[3],Char_t *vtxName) { + Double_t snr[3], const char *vtxName) { // // Constructor for Pb-Pb // diff --git a/ITS/AliITSVertex.h b/ITS/AliITSVertex.h index bfaf6cba025..c1d708d7e43 100644 --- a/ITS/AliITSVertex.h +++ b/ITS/AliITSVertex.h @@ -34,14 +34,14 @@ class AliITSVertex : public TNamed { AliITSVertex(); AliITSVertex(Double_t positionZ,Double_t sigmaZ,Int_t nContributors, - Char_t *vtxName="Vertex"); + const char *vtxName="Vertex"); AliITSVertex(Double_t phi,Double_t position[3],Double_t covmatrix[6], Double_t chi2,Int_t nContributors, - Char_t *vtxName="Vertex"); + const char *vtxName="Vertex"); AliITSVertex(Double_t position[3],Double_t sigma[3], - Char_t *vtxName="Vertex"); + const char *vtxName="Vertex"); AliITSVertex(Double_t position[3],Double_t sigma[3],Double_t snr[3], - Char_t *vtxName="Vertex"); + const char *vtxName="Vertex"); virtual ~AliITSVertex(); diff --git a/ITS/AliITStrackerSA.cxx b/ITS/AliITStrackerSA.cxx index e0cd647f3f5..1dac866c48d 100644 --- a/ITS/AliITStrackerSA.cxx +++ b/ITS/AliITStrackerSA.cxx @@ -159,7 +159,7 @@ void AliITStrackerSA::ResetForFinding(){ fPointc[1]=0; } //____________________________________________________________________________ -void AliITStrackerSA::FindTracks(TTree *clusterTree, TTree *out,Int_t evnumber,char *opt){ +void AliITStrackerSA::FindTracks(TTree *clusterTree, TTree *out,Int_t evnumber,const char *opt){ /************************************************************************** * Options: to use only ITS execute FindTracks * @@ -429,7 +429,7 @@ void AliITStrackerSA::UseFoundTracksV2(Int_t evnum,TTree* treev2, TTree* cluster //________________________________________________________________________ -AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex,Double_t *errorsprimvert,char *opt){ +AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVertex,Double_t *errorsprimvert, const char *opt){ //fit of the found track //options diff --git a/ITS/AliITStrackerSA.h b/ITS/AliITStrackerSA.h index 3f21f9a2f81..9ab4fb2c29a 100644 --- a/ITS/AliITStrackerSA.h +++ b/ITS/AliITStrackerSA.h @@ -30,10 +30,10 @@ class AliITStrackerSA : public AliITStrackerV2 { AliITStrackerSA(AliITStrackerSA& tracker); virtual ~AliITStrackerSA(); void FindTracks(TTree *clusterTree, TTree *out,Int_t evnumber=0, - char *opt="6/6"); + const char *opt="6/6"); AliITStrackV2* FitTrack(AliITStrackSA* tr,Double_t* primaryVertex, - Double_t *errorprimvert,char *opt="6/6"); + Double_t *errorprimvert, const char *opt="6/6"); AliITStrackV2* FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const; void SetVertex(AliITSVertex *vtx){fVert = vtx;} diff --git a/ITS/AliITSvPPRasymmFMD.cxx b/ITS/AliITSvPPRasymmFMD.cxx index 202201fdd2d..d854bae1e05 100644 --- a/ITS/AliITSvPPRasymmFMD.cxx +++ b/ITS/AliITSvPPRasymmFMD.cxx @@ -5024,7 +5024,7 @@ void AliITSvPPRasymmFMD::InitAliITSgeom(){ Char_t names[knlayers][kndeep][4]; Int_t itsGeomTreeCopys[knlayers][kndeep]; if(fMinorVersion == 1){ // Option A - Char_t *namesA[knlayers][kndeep] = { + const char *namesA[knlayers][kndeep] = { {"ALIC","ITSV","ITSD","IT12","I12A","I10A","I103","I101","ITS1"}, // lay=1 {"ALIC","ITSV","ITSD","IT12","I12A","I20A","I1D3","I1D1","ITS2"}, // lay=2 {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3"," "," "}, // lay=3 @@ -5042,7 +5042,7 @@ void AliITSvPPRasymmFMD::InitAliITSgeom(){ itsGeomTreeCopys[i][j] = itsGeomTreeCopysA[i][j]; } // end for i,j }else if(fMinorVersion == 2){ // Option B - Char_t *namesB[knlayers][kndeep] = { + const char *namesB[knlayers][kndeep] = { {"ALIC","ITSV","ITSD","IT12","I12B","I10B","I107","I101","ITS1"}, // lay=1 {"ALIC","ITSV","ITSD","IT12","I12B","I20B","I1D7","I1D1","ITS2"}, // lay=2 {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3"," "," "}, // lay=3 diff --git a/ITS/AliITSvSPD02.cxx b/ITS/AliITSvSPD02.cxx index 5152df120de..98cd20d515d 100644 --- a/ITS/AliITSvSPD02.cxx +++ b/ITS/AliITSvSPD02.cxx @@ -479,7 +479,7 @@ void AliITSvSPD02::InitAliITSgeom(){ Int_t mod,typ,lay,lad,det,cpy,i,j,k; Char_t names[kltypess][kndeep][4]; Int_t itsGeomTreeCopys[kltypess][kndeep]; - Char_t *namesA[kltypess][kndeep] = { + const char *namesA[kltypess][kndeep] = { {"ALIC","ITSV","ITEL","IMB0","IMBS"}, // lay=1 {"ALIC","ITSV","IDET","ITS0","ITST"}};// Test SPD Int_t itsGeomTreeCopysA[kltypess][kndeep]= {{1,1,4,1,1},// lay=1 diff --git a/ITS/AliITSvtest.cxx b/ITS/AliITSvtest.cxx index bdde5973bd0..0a2b20cd341 100644 --- a/ITS/AliITSvtest.cxx +++ b/ITS/AliITSvtest.cxx @@ -200,7 +200,7 @@ void AliITSvtest::InitAliITSgeom(){ Int_t npar,natt,idshape,imat,imed; AliITSGeant3Geometry *ig = new AliITSGeant3Geometry(); Int_t mod,lay,lad,det,i,j,k; - char *names[nlayers][ndeep] = { + const char *names[nlayers][ndeep] = { {"ALIC","ITSV","ITSD","IT12","I12B","I10B","I107","I101","ITS1"}, // lay=1 {"ALIC","ITSV","ITSD","IT12","I12B","I20B","I1D7","I1D1","ITS2"}, // lay=2 {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3"," "," "}, // lay=3 diff --git a/MUON/AliMUONv3.cxx b/MUON/AliMUONv3.cxx index ad87820fc52..9cea1dfd776 100644 --- a/MUON/AliMUONv3.cxx +++ b/MUON/AliMUONv3.cxx @@ -625,8 +625,8 @@ void AliMUONv3::CreateGeometry() tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); tpar[2] = dstation/5; - char *slats5Mother = "S05M"; - char *slats6Mother = "S06M"; + const char *slats5Mother = "S05M"; + const char *slats6Mother = "S06M"; Float_t zoffs5 = 0; Float_t zoffs6 = 0; diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 47b5aa39333..22069283e45 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -40,7 +40,7 @@ class AliPHOSPID : public TTask { virtual void Print() const { Warning("Print", "not defined" ) ;} void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } - virtual char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } + virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } virtual void WriteRecParticles() = 0; protected: diff --git a/PHOS/AliPHOSPIDv0.cxx b/PHOS/AliPHOSPIDv0.cxx index ba4c53de256..ff914db04ac 100644 --- a/PHOS/AliPHOSPIDv0.cxx +++ b/PHOS/AliPHOSPIDv0.cxx @@ -368,7 +368,7 @@ void AliPHOSPIDv0:: Print() const } //____________________________________________________________________________ -void AliPHOSPIDv0::SetShowerProfileCut(char * formula) +void AliPHOSPIDv0::SetShowerProfileCut(const char * formula) { //set shape of the cut on the axis of ellipce, drown around shouer //shower considered "narrow" if Formula(lambda[0],lambda[1]) > 0. diff --git a/PHOS/AliPHOSPIDv0.h b/PHOS/AliPHOSPIDv0.h index 8dc88088478..216511d2559 100644 --- a/PHOS/AliPHOSPIDv0.h +++ b/PHOS/AliPHOSPIDv0.h @@ -39,14 +39,14 @@ public: virtual void PlotDispersionCuts()const ; virtual void Print()const ; - virtual void SetIdentificationMethod(char * option = "CPV DISP" ){fIDOptions = option ;} - virtual void SetShowerProfileCut(char * formula = "0.35*0.35 - (x-1.386)*(x-1.386) - 1.707*1.707*(y-1.008)*(y-1.008)") ; + virtual void SetIdentificationMethod(const char * option = "CPV DISP" ){fIDOptions = option ;} + virtual void SetShowerProfileCut(const char * formula = "0.35*0.35 - (x-1.386)*(x-1.386) - 1.707*1.707*(y-1.008)*(y-1.008)") ; virtual void SetDispersionCut(Float_t cut){fDispersion = cut ; } virtual void SetCpvtoEmcDistanceCut(Float_t cut ) {fCpvEmcDistance = cut ;} virtual void SetTimeGate(Float_t gate) {fTimeGate = gate ;} // virtual void SetTrackSegmentsBranch(const char* title) { fTrackSegmentsTitle = title;} // virtual void SetRecParticlesBranch (const char* title) { fRecParticlesTitle = title;} - virtual char * Version() const { return "pid-v0" ; } + virtual const char * Version() const { return "pid-v0" ; } private: diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h index 9f6aa25f566..3ee659f7538 100644 --- a/PHOS/AliPHOSPIDv1.h +++ b/PHOS/AliPHOSPIDv1.h @@ -69,7 +69,7 @@ public: void Print() const ; - virtual char * Version() const { return "pid-v1" ; } + virtual const char * Version() const { return "pid-v1" ; } AliPHOSPIDv1 & operator = (const AliPHOSPIDv1 & /*pid*/) { return *this ;} diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx index a3de7d24d1d..805364b2230 100644 --- a/PHOS/AliPHOSvImpacts.cxx +++ b/PHOS/AliPHOSvImpacts.cxx @@ -125,7 +125,7 @@ void AliPHOSvImpacts::Copy(AliPHOSvImpacts & phos) //____________________________________________________________________________ -void AliPHOSvImpacts::AddImpact( char* det, Int_t shunt, Int_t primary, Int_t track, Int_t module, +void AliPHOSvImpacts::AddImpact(const char* det, Int_t shunt, Int_t primary, Int_t track, Int_t module, Int_t pid, TLorentzVector p, Float_t *xyz) { // Add an impact to the impact list. diff --git a/PHOS/AliPHOSvImpacts.h b/PHOS/AliPHOSvImpacts.h index ea775acf244..5eac3e04dc7 100644 --- a/PHOS/AliPHOSvImpacts.h +++ b/PHOS/AliPHOSvImpacts.h @@ -33,7 +33,7 @@ public: virtual ~AliPHOSvImpacts(void) ; virtual void Copy(AliPHOSvImpacts & phos) ; - virtual void AddImpact(char* detector, Int_t shunt, Int_t primary, Int_t track, + virtual void AddImpact(const char* detector, Int_t shunt, Int_t primary, Int_t track, Int_t module, Int_t pid, TLorentzVector p, Float_t *xyz) ; virtual void MakeBranch(Option_t *opt=" "); virtual void ResetHits(); diff --git a/RALICE/AliAttribObj.cxx b/RALICE/AliAttribObj.cxx index a7eb2a3504c..6ee55c3506e 100644 --- a/RALICE/AliAttribObj.cxx +++ b/RALICE/AliAttribObj.cxx @@ -73,7 +73,7 @@ AliAttribObj::AliAttribObj(AliAttribObj& a) : TObject(a),AliAttrib(a) // Copy constructor } /////////////////////////////////////////////////////////////////////////// -TObject* AliAttribObj::Clone(char* name) +TObject* AliAttribObj::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliAttribObj.h b/RALICE/AliAttribObj.h index 0cdc2fbd4dc..634a834d667 100644 --- a/RALICE/AliAttribObj.h +++ b/RALICE/AliAttribObj.h @@ -16,7 +16,7 @@ class AliAttribObj : public TObject,public AliAttrib AliAttribObj(AliAttrib& a); // Constructor virtual ~AliAttribObj(); // Destructor AliAttribObj(AliAttribObj& a); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer ClassDef(AliAttribObj,2) // Generic handling of detector signal (calibration) attributes. }; diff --git a/RALICE/AliCalmodule.cxx b/RALICE/AliCalmodule.cxx index fa2e871c80c..4fae9d32040 100644 --- a/RALICE/AliCalmodule.cxx +++ b/RALICE/AliCalmodule.cxx @@ -121,7 +121,7 @@ Float_t AliCalmodule::GetClusteredSignal() } } /////////////////////////////////////////////////////////////////////////// -TObject* AliCalmodule::Clone(char* name) +TObject* AliCalmodule::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliCalmodule.h b/RALICE/AliCalmodule.h index b728f9461df..10047f96756 100644 --- a/RALICE/AliCalmodule.h +++ b/RALICE/AliCalmodule.h @@ -14,7 +14,7 @@ class AliCalmodule : public AliSignal virtual ~AliCalmodule(); // Default destructor AliCalmodule(AliCalmodule& m); // Copy constructor AliCalmodule(Int_t row,Int_t col,Double_t sig); // Create a module and initialise data - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer virtual void SetSignal(Double_t sig,Int_t j=1); // Set or change data for certain module virtual void AddSignal(Double_t sig,Int_t j=1); // Add signal to a certain module void SetRow(Int_t i); // Set the row number of the module diff --git a/RALICE/AliCalorimeter.cxx b/RALICE/AliCalorimeter.cxx index 85c045e2d32..df4711185d4 100644 --- a/RALICE/AliCalorimeter.cxx +++ b/RALICE/AliCalorimeter.cxx @@ -1681,7 +1681,7 @@ Int_t AliCalorimeter::GetSwapMode() return fSwap; } /////////////////////////////////////////////////////////////////////////// -TObject* AliCalorimeter::Clone(char* name) +TObject* AliCalorimeter::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliCalorimeter.h b/RALICE/AliCalorimeter.h index 8bac7621ec3..3628c79b38f 100644 --- a/RALICE/AliCalorimeter.h +++ b/RALICE/AliCalorimeter.h @@ -26,7 +26,7 @@ class AliCalorimeter : public TNamed AliCalorimeter(Int_t nrow,Int_t ncol); // Create a calorimeter matrix virtual ~AliCalorimeter(); // Destructor AliCalorimeter(AliCalorimeter& c); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide pointer of the copy + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide pointer of the copy Int_t GetNrows(); // Return number of rows of the matrix Int_t GetNcolumns(); // Return number of columns of the matrix void SetSignal(Int_t row,Int_t col,Float_t s); // Set signal for a certain module diff --git a/RALICE/AliEvent.cxx b/RALICE/AliEvent.cxx index 0914cf9f9f9..4e1a761b2e2 100644 --- a/RALICE/AliEvent.cxx +++ b/RALICE/AliEvent.cxx @@ -676,7 +676,7 @@ void AliEvent::ShowDevices() } } /////////////////////////////////////////////////////////////////////////// -TObject* AliEvent::Clone(char* name) +TObject* AliEvent::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliEvent.h b/RALICE/AliEvent.h index b743043231e..2280b998051 100644 --- a/RALICE/AliEvent.h +++ b/RALICE/AliEvent.h @@ -21,7 +21,7 @@ class AliEvent : public AliVertex AliEvent(Int_t n); // Create an event to hold initially n tracks virtual ~AliEvent(); // Default destructor AliEvent(AliEvent& evt); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer virtual void SetOwner(Bool_t own=kTRUE);// Set ownership of all added objects void SetDayTime(TTimeStamp& stamp); // Set the date and time stamp exactly as specified (1 ns accuracy) void SetDayTime(TDatime& stamp); // Set date and time stamp interpreted as local time (1 s accuracy) diff --git a/RALICE/AliJet.cxx b/RALICE/AliJet.cxx index 2e0251a1087..49538bd103b 100644 --- a/RALICE/AliJet.cxx +++ b/RALICE/AliJet.cxx @@ -586,7 +586,7 @@ Int_t AliJet::GetId() return fUserId; } /////////////////////////////////////////////////////////////////////////// -TObject* AliJet::Clone(char* name) +TObject* AliJet::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliJet.h b/RALICE/AliJet.h index 8470178f058..8f6f87b93e8 100644 --- a/RALICE/AliJet.h +++ b/RALICE/AliJet.h @@ -20,7 +20,7 @@ class AliJet : public TNamed,public Ali4Vector AliJet(Int_t n); // Create a Jet to hold initially n Tracks virtual ~AliJet(); // Default destructor AliJet(AliJet& j); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer virtual void SetOwner(Bool_t own=kTRUE); // Set ownership of all added objects virtual void Reset(); // Reset all values void AddTrack(AliTrack& t); // Add a track to the jet diff --git a/RALICE/AliSignal.cxx b/RALICE/AliSignal.cxx index ba90534636d..f56f5fde561 100644 --- a/RALICE/AliSignal.cxx +++ b/RALICE/AliSignal.cxx @@ -835,7 +835,7 @@ void AliSignal::ResetLink(TObject* obj) } } /////////////////////////////////////////////////////////////////////////// -TObject* AliSignal::Clone(char* name) +TObject* AliSignal::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliSignal.h b/RALICE/AliSignal.h index 18ef6b39219..1a31863a2a8 100644 --- a/RALICE/AliSignal.h +++ b/RALICE/AliSignal.h @@ -19,7 +19,7 @@ class AliSignal : public TNamed,public AliPosition,public AliAttrib AliSignal(); // Default constructor virtual ~AliSignal(); // Destructor AliSignal(AliSignal& s); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer virtual void SetSignal(Double_t sig,Int_t j=1); // Store j-th signal value virtual void AddSignal(Double_t sig,Int_t j=1); // Add value to j-th signal value virtual Float_t GetSignal(Int_t j=1,Int_t mode=0); // Provide j-th (corrected) signal value diff --git a/RALICE/AliTrack.cxx b/RALICE/AliTrack.cxx index e28171e3979..8e7db6eb5cc 100644 --- a/RALICE/AliTrack.cxx +++ b/RALICE/AliTrack.cxx @@ -1134,7 +1134,7 @@ Float_t AliTrack::GetProb() return fProb; } /////////////////////////////////////////////////////////////////////////// -TObject* AliTrack::Clone(char* name) +TObject* AliTrack::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliTrack.h b/RALICE/AliTrack.h index 5276b5bc3a1..0a9c7639c72 100644 --- a/RALICE/AliTrack.h +++ b/RALICE/AliTrack.h @@ -21,7 +21,7 @@ class AliTrack : public TNamed,public Ali4Vector AliTrack(); // Default constructor virtual ~AliTrack(); // Destructor AliTrack(AliTrack& t); // Copy constructor - virtual TObject* Clone(char* name="");// Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name="");// Make a deep copy and provide its pointer virtual void Reset(); // Reset all values to 0 void Set4Momentum(Ali4Vector& p); // Set track 4-momentum void Set3Momentum(Ali3Vector& p); // Set track 3-momentum diff --git a/RALICE/AliVertex.cxx b/RALICE/AliVertex.cxx index d5fc6cb7b24..55847baab1a 100644 --- a/RALICE/AliVertex.cxx +++ b/RALICE/AliVertex.cxx @@ -992,7 +992,7 @@ void AliVertex::Draw(Int_t secs,Int_t cons,Int_t jets) } } /////////////////////////////////////////////////////////////////////////// -TObject* AliVertex::Clone(char* name) +TObject* AliVertex::Clone(const char* name) { // Make a deep copy of the current object and provide the pointer to the copy. // This memberfunction enables automatic creation of new objects of the diff --git a/RALICE/AliVertex.h b/RALICE/AliVertex.h index 777779d90a1..f9e96ca35c8 100644 --- a/RALICE/AliVertex.h +++ b/RALICE/AliVertex.h @@ -21,7 +21,7 @@ class AliVertex : public AliJet,public AliPosition AliVertex(Int_t n); // Create a vertex to hold initially n tracks virtual ~AliVertex(); // Default destructor AliVertex(AliVertex& v); // Copy constructor - virtual TObject* Clone(char* name=""); // Make a deep copy and provide its pointer + virtual TObject* Clone(const char* name=""); // Make a deep copy and provide its pointer virtual void SetOwner(Bool_t own=kTRUE);// Set ownership of all added objects virtual void Reset(); // Reset all values and stored vertex and jet lists void ResetVertices(); // Reset stored vertex list diff --git a/RICH/AliRICHv0.cxx b/RICH/AliRICHv0.cxx index bb8a57bdd28..b4b9fd8ba6d 100644 --- a/RICH/AliRICHv0.cxx +++ b/RICH/AliRICHv0.cxx @@ -27,7 +27,7 @@ ClassImp(AliRICHv0) void AliRICHv0::StepManager() { //This StepManager is a provision for different test-learn activities on the current MC layer - char *sParticle; + const char *sParticle; switch(gMC->TrackPid()){ case kProton: sParticle="proton";break; diff --git a/TOF/AliTOFReconstructionerV2.cxx b/TOF/AliTOFReconstructionerV2.cxx index 53e21449a56..04aaeba3f83 100644 --- a/TOF/AliTOFReconstructionerV2.cxx +++ b/TOF/AliTOFReconstructionerV2.cxx @@ -79,7 +79,7 @@ ClassImp(AliTOFReconstructionerV2) } //____________________________________________________________________________ -AliTOFReconstructionerV2::AliTOFReconstructionerV2(char* tpcBackTracks, char* tofDigits):TTask("AliTOFReconstructionerV2","") +AliTOFReconstructionerV2::AliTOFReconstructionerV2(const char* tpcBackTracks, const char* tofDigits):TTask("AliTOFReconstructionerV2","") { // // par ctor @@ -942,7 +942,7 @@ void AliTOFReconstructionerV2::Comparison(Int_t* rtIndex) Int_t nEvent = 0; - Char_t *datafile = "galice.root"; + const char *datafile = "galice.root"; AliRunLoader *rl = AliRunLoader::Open(datafile); if (rl == 0x0) diff --git a/TOF/AliTOFReconstructionerV2.h b/TOF/AliTOFReconstructionerV2.h index 91f8eb2589e..4bac6ce6d87 100644 --- a/TOF/AliTOFReconstructionerV2.h +++ b/TOF/AliTOFReconstructionerV2.h @@ -22,7 +22,7 @@ class AliTOFReconstructionerV2: public TTask { public: AliTOFReconstructionerV2() ; // ctor - AliTOFReconstructionerV2(char* tpcBackTracks, char* tofDigits="digits.root"); + AliTOFReconstructionerV2(const char* tpcBackTracks, const char* tofDigits="digits.root"); AliTOFReconstructionerV2(const AliTOFReconstructionerV2 & rec); virtual ~AliTOFReconstructionerV2() ; // dtor Bool_t BackPropagation(){return kTRUE;}; diff --git a/TPC/AliClustersArray.cxx b/TPC/AliClustersArray.cxx index bbbe77eecde..253834e4814 100644 --- a/TPC/AliClustersArray.cxx +++ b/TPC/AliClustersArray.cxx @@ -49,7 +49,7 @@ AliClustersArray::AliClustersArray() fClFinder = 0; } -Bool_t AliClustersArray::SetClusterType(Text_t * classname) +Bool_t AliClustersArray::SetClusterType(const char * classname) { // //set type of Clusters diff --git a/TPC/AliClustersArray.h b/TPC/AliClustersArray.h index 054ae143154..421ceca7292 100644 --- a/TPC/AliClustersArray.h +++ b/TPC/AliClustersArray.h @@ -22,7 +22,7 @@ public: AliClustersFinder * GetFinder() {return fClFinder;} virtual Bool_t SetParam(AliDetectorParam * param); virtual Bool_t SetFinder(AliClustersFinder * finder); - Bool_t SetClusterType(Text_t *classname ); + Bool_t SetClusterType(const char *classname ); TClass * GetClusterType() {return fClusterType;} protected: AliDetectorParam * fParam; //pointer to detector parameters diff --git a/TPC/AliTPCtrackerParam.cxx b/TPC/AliTPCtrackerParam.cxx index 5e0596b6ab7..c64d9533885 100644 --- a/TPC/AliTPCtrackerParam.cxx +++ b/TPC/AliTPCtrackerParam.cxx @@ -486,7 +486,7 @@ void AliTPCtrackerParam::AnalyzedEdx(const Char_t *outName,Int_t pdg) { gStyle->SetOptStat(0); gStyle->SetOptFit(10001); - Char_t *part="PIONS"; + const char *part="PIONS"; Double_t ymax=500.; /* @@ -1823,19 +1823,19 @@ void AliTPCtrackerParam::MakeDataBase() { //----------------------------------------------------------------------------- // define some file names - Char_t *effFile ="TPCeff.root"; - Char_t *pullsFile ="pulls.root"; - Char_t *regPiFile ="regPi.root"; - Char_t *regKaFile ="regKa.root"; - Char_t *regPrFile ="regPr.root"; - Char_t *regElFile ="regEl.root"; - Char_t *regMuFile ="regMu.root"; - Char_t *dEdxPiFile="dEdxPi.root"; - Char_t *dEdxKaFile="dEdxKa.root"; - Char_t *dEdxPrFile="dEdxPr.root"; - Char_t *dEdxElFile="dEdxEl.root"; - Char_t *dEdxMuFile="dEdxMu.root"; - Char_t *cmFile ="CovMatrix_AllEvts.root"; + const char *effFile ="TPCeff.root"; + const char *pullsFile ="pulls.root"; + const char *regPiFile ="regPi.root"; + const char *regKaFile ="regKa.root"; + const char *regPrFile ="regPr.root"; + const char *regElFile ="regEl.root"; + const char *regMuFile ="regMu.root"; + const char *dEdxPiFile="dEdxPi.root"; + const char *dEdxKaFile="dEdxKa.root"; + const char *dEdxPrFile="dEdxPr.root"; + const char *dEdxElFile="dEdxEl.root"; + const char *dEdxMuFile="dEdxMu.root"; + const char *cmFile ="CovMatrix_AllEvts.root"; /* Char_t *cmFile1 ="CovMatrix_AllEvts_1.root"; Char_t *cmFile2 ="CovMatrix_AllEvts_2.root"; @@ -2212,7 +2212,7 @@ void AliTPCtrackerParam::MergeEvents(Int_t evFirst,Int_t evLast) { // 2) computes the average TPC efficiencies //----------------------------------------------------------------------------- - Char_t *outName="TPCeff.root"; + const char *outName="TPCeff.root"; // merge files with tracks cerr<<" ******** MERGING FILES **********\n\n"; @@ -2595,7 +2595,7 @@ void AliTPCtrackerParam::RegularizeCovMatrix(const Char_t *outName,Int_t pdg) { gStyle->SetOptFit(10001); Int_t thisPdg=211; - Char_t *part="Pions - "; + const char *part="Pions - "; InitializeKineGrid("DB"); SetParticle(pdg); @@ -3237,9 +3237,9 @@ Int_t AliTPCtrackerParam::WritedEdx(const Char_t *outName,Int_t pdg) { //----------------------------------------------------------------------------- Option_t *opt; - Char_t *dirName="Pions"; - Char_t *meanName="dEdxMeanPi"; - Char_t *rmsName="dEdxRMSPi"; + const char *dirName="Pions"; + const char *meanName="dEdxMeanPi"; + const char *rmsName="dEdxRMSPi"; SetParticle(pdg); @@ -3389,8 +3389,8 @@ Int_t AliTPCtrackerParam::WriteRegParams(const Char_t *outName,Int_t pdg) { //----------------------------------------------------------------------------- Option_t *opt; - Char_t *dirName="Pions"; - Char_t *keyName="RegPions"; + const char *dirName="Pions"; + const char *keyName="RegPions"; SetParticle(pdg); diff --git a/TRD/AliTRDsegmentArray.cxx b/TRD/AliTRDsegmentArray.cxx index fbe9ea00964..385ca7d7c0a 100644 --- a/TRD/AliTRDsegmentArray.cxx +++ b/TRD/AliTRDsegmentArray.cxx @@ -42,7 +42,7 @@ AliTRDsegmentArray::AliTRDsegmentArray():AliTRDsegmentArrayBase() } //_____________________________________________________________________________ -AliTRDsegmentArray::AliTRDsegmentArray(Text_t *classname, Int_t n) +AliTRDsegmentArray::AliTRDsegmentArray(const char *classname, Int_t n) :AliTRDsegmentArrayBase(classname,n) { // diff --git a/TRD/AliTRDsegmentArray.h b/TRD/AliTRDsegmentArray.h index 7638bec6efc..bcd028a1f85 100644 --- a/TRD/AliTRDsegmentArray.h +++ b/TRD/AliTRDsegmentArray.h @@ -21,7 +21,7 @@ class AliTRDsegmentArray : public AliTRDsegmentArrayBase { public: AliTRDsegmentArray(); - AliTRDsegmentArray(Text_t *classname, Int_t n); + AliTRDsegmentArray(const char *classname, Int_t n); AliTRDsegmentArray(AliTRDsegmentArray &a); virtual ~AliTRDsegmentArray(); diff --git a/TRD/AliTRDsegmentArrayBase.cxx b/TRD/AliTRDsegmentArrayBase.cxx index a14ff9483ab..cc52a5c21cb 100644 --- a/TRD/AliTRDsegmentArrayBase.cxx +++ b/TRD/AliTRDsegmentArrayBase.cxx @@ -51,7 +51,7 @@ AliTRDsegmentArrayBase::AliTRDsegmentArrayBase():TNamed() } //_____________________________________________________________________________ -AliTRDsegmentArrayBase::AliTRDsegmentArrayBase(Text_t *classname, Int_t n) +AliTRDsegmentArrayBase::AliTRDsegmentArrayBase(const char *classname, Int_t n) { // // Create an array of objects of . The class must inherit from @@ -135,7 +135,7 @@ void AliTRDsegmentArrayBase::Copy(TObject &a) } //_____________________________________________________________________________ -Bool_t AliTRDsegmentArrayBase::SetClass(Text_t *classname) +Bool_t AliTRDsegmentArrayBase::SetClass(const char *classname) { // // Sets the classname of the stored object diff --git a/TRD/AliTRDsegmentArrayBase.h b/TRD/AliTRDsegmentArrayBase.h index 7a77b65caa9..c4b7d7e2881 100644 --- a/TRD/AliTRDsegmentArrayBase.h +++ b/TRD/AliTRDsegmentArrayBase.h @@ -22,7 +22,7 @@ class AliTRDsegmentArrayBase: public TNamed { public: AliTRDsegmentArrayBase(); - AliTRDsegmentArrayBase(Text_t *classname, Int_t n); + AliTRDsegmentArrayBase(const char *classname, Int_t n); AliTRDsegmentArrayBase(const AliTRDsegmentArrayBase &a); virtual ~AliTRDsegmentArrayBase(); AliTRDsegmentArrayBase &operator=(const AliTRDsegmentArrayBase &a); @@ -43,7 +43,7 @@ class AliTRDsegmentArrayBase: public TNamed { virtual void StoreSegment(Int_t index); Bool_t MakeDictionary(Int_t size); - Bool_t SetClass(Text_t *classname); + Bool_t SetClass(const char *classname); TClass *GetClass() const { return fClass; }; TTree *GetTree() const { return fTree; }; diff --git a/TRD/AliTRDsimpleMC.cxx b/TRD/AliTRDsimpleMC.cxx index 79fdb6a3974..9f2c8166ed4 100644 --- a/TRD/AliTRDsimpleMC.cxx +++ b/TRD/AliTRDsimpleMC.cxx @@ -348,7 +348,7 @@ const char *AliTRDsimpleMC::CurrentVolName() const // Check for the current volume // - Char_t *volName = "UA00"; + const char *volName = "UA00"; // Drift region if ((fTrackX-fX0) < AliTRDgeometry::DrThick()) { -- 2.39.3