From a6e0ebfecb0f40425d846df3110255aecf0a2c4b Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 12 Nov 2008 15:47:19 +0000 Subject: [PATCH] Correct character constantness --- ANALYSIS/AliEventPoolOTF.h | 6 +- EMCAL/AliEMCALGeometry.cxx | 2 +- EMCAL/AliEMCALGeometry.h | 8 +- EMCAL/AliEMCALHistoUtilities.cxx | 2 +- EMCAL/AliEMCALHistoUtilities.h | 2 +- EMCAL/AliEMCALv0.cxx | 4 +- EMCAL/AliEMCALv2.cxx | 8 +- EMCAL/Calib/AliEMCALCalibCoefs.cxx | 6 +- EMCAL/Calib/AliEMCALPi0Calibration.cxx | 10 +- EMCAL/Calib/AliEMCALPi0Calibration.h | 2 +- ESDCheck/AliFMDQATask.cxx | 8 +- ESDCheck/AliTRDQATask.cxx | 4 +- ESDCheck/AliTRDQATask.h | 4 +- EVE/EveDet/AliEveTRDData.cxx | 2 +- EVE/EveDet/AliEveTRDLoaderManager.cxx | 2 +- EVE/EveDet/AliEveTRDTrackListEditor.cxx | 4 +- HLT/BASE/AliHLTHOMERLibManager.cxx | 8 +- HLT/TPCLib/AliHLTTPCMerger.cxx | 2 +- HLT/TPCLib/AliHLTTPCMerger.h | 2 +- HLT/TPCLib/AliHLTTPCTrackArray.cxx | 4 +- HLT/TPCLib/AliHLTTPCTrackArray.h | 4 +- HMPID/AliHMPIDHit.cxx | 2 +- HMPID/AliHMPIDRawStream.h | 8 +- HMPID/AliHMPIDv3.cxx | 2 +- HMPID/AliHMPIDv3.h | 2 +- ITS/AliITS.cxx | 2 +- ITS/AliITSDetTypeRec.cxx | 2 +- ITS/AliITSDetTypeRec.h | 18 +-- ITS/AliITSDetTypeSim.cxx | 6 +- ITS/AliITSDetTypeSim.h | 12 +- ITS/AliITSInitGeometry.cxx | 6 +- ITS/AliITSv11GeometrySSD.cxx | 14 +-- ITS/AliITSv11GeometrySSD.h | 4 +- ITS/AliITSv11GeometrySupport.cxx | 6 +- ITS/AliITSvSDD03.cxx | 2 +- JETAN/AliJetAnalysis.cxx | 3 +- JETAN/AliJetAnalysis.h | 4 +- JETAN/AliJetDistributions.cxx | 3 +- JETAN/AliJetDistributions.h | 6 +- JETAN/AliJetDummyGeo.h | 4 +- MUON/AliMUONGlobalTriggerBoard.cxx | 2 +- MUON/AliMUONGlobalTriggerBoard.h | 2 +- MUON/AliMUONLocalTriggerBoard.cxx | 6 +- MUON/AliMUONRegionalTriggerBoard.cxx | 2 +- MUON/AliMUONRegionalTriggerBoard.h | 2 +- MUON/AliMUONSurveyObj.cxx | 12 +- MUON/AliMUONSurveyObj.h | 2 +- Makefile | 2 +- PWG0/AliCorrection.h | 4 +- PWG0/AliCorrectionMatrix2D.cxx | 2 +- PWG0/AliCorrectionMatrix2D.h | 4 +- PWG0/AliCorrectionMatrix3D.cxx | 4 +- PWG0/AliCorrectionMatrix3D.h | 6 +- PWG0/AliPWG0Helper.cxx | 2 +- PWG0/AliPWG0Helper.h | 2 +- PWG0/TPC/AliTPCClusterHistograms.cxx | 2 +- PWG0/dNdEta/dNdEtaAnalysis.cxx | 2 +- PWG0/dNdEta/dNdEtaAnalysis.h | 10 +- .../AliHighMultiplicitySelector.cxx | 2 +- PWG2/FLOW/AliCumulantsFunctions.cxx | 4 +- PWG3/base/AliQuarkoniaEfficiency.cxx | 4 +- PWG3/muon/AliAODEventInfo.cxx | 2 +- PWG3/muon/AliAODEventInfo.h | 2 +- PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx | 2 +- .../AliAnalysisTaskMuonAODfromGeneral.cxx | 2 +- PWG3/muon/AliAnalysisTaskSingleMu.cxx | 4 +- PWG3/muon/AliAnalysisTaskTrigChEff.cxx | 8 +- PWG3/muondep/AliCheckMuonDetEltResponse.cxx | 12 +- PWG3/vertexingHF/AliAnalysisVertexingHF.cxx | 2 +- PWG4/PartCorr/AliAnalysisTaskPHOSExample.cxx | 2 +- STEER/AliESDInputHandlerRP.h | 2 +- STEER/AliGlobalQADataMaker.cxx | 10 +- STEER/AliMCEventHandler.h | 2 +- STEER/AliQADataMakerSteer.cxx | 2 +- STEER/AliQADataMakerSteer.h | 8 +- STEER/AliSimulation.cxx | 12 +- STEER/AliSplineFit.cxx | 2 +- STEER/AliSplineFit.h | 2 +- STRUCT/AliFRAMEv2.cxx | 4 +- STRUCT/AliFRAMEv2.h | 4 +- STRUCT/AliPIPEv3.cxx | 2 +- STRUCT/AliPIPEv3.h | 2 +- THerwig/THerwig6.cxx | 2 +- THerwig/THerwig6.h | 30 ++--- TOF/AliTOFAlignment.cxx | 16 +-- TOF/AliTOFAlignment.h | 8 +- TOF/AliTOFcalib.cxx | 112 +++++++++--------- TOF/AliTOFcalib.h | 56 ++++----- TPC/AliTPCAltroEmulator.cxx | 2 +- TPC/AliTPCAltroEmulator.h | 2 +- TPC/AliTPCCalibCE.cxx | 4 +- TPC/AliTPCCalibCE.h | 4 +- TPC/AliTPCCalibPedestal.cxx | 2 +- TPC/AliTPCCalibPedestal.h | 2 +- TPC/AliTPCCalibPulser.cxx | 2 +- TPC/AliTPCCalibPulser.h | 2 +- TPC/AliTPCCalibViewer.cxx | 6 +- TPC/AliTPCCalibViewer.h | 6 +- TPC/AliTPCCalibViewerGUI.cxx | 2 +- TPC/AliTPCCalibViewerGUI.h | 2 +- TPC/AliTPCLaserTracks.cxx | 5 +- TPC/AliTPCMonitor.cxx | 2 +- TPC/AliTPCMonitor.h | 2 +- TPC/AliTPCclustererKr.cxx | 2 +- TRD/AliTRDCalibPadStatus.cxx | 2 +- TRD/AliTRDCalibPadStatus.h | 2 +- TRD/AliTRDalignment.cxx | 2 +- TRD/AliTRDrawTPStream.cxx | 2 +- TRD/AliTRDrawTPStream.h | 6 +- TRD/Cal/AliTRDCalPID.cxx | 4 +- TRD/Cal/AliTRDCalPID.h | 12 +- TRD/qaRec/run.h | 4 +- UNICOR/AliDHN.cxx | 2 + build/module.dep | 2 - 114 files changed, 338 insertions(+), 337 deletions(-) diff --git a/ANALYSIS/AliEventPoolOTF.h b/ANALYSIS/AliEventPoolOTF.h index a464958e41f..707f99e717a 100644 --- a/ANALYSIS/AliEventPoolOTF.h +++ b/ANALYSIS/AliEventPoolOTF.h @@ -33,8 +33,8 @@ class AliEventPoolOTF : public AliVEventPool virtual void SetMultiplicityBin(Int_t min, Int_t max, Int_t step) {fMultMin = min; fMultMax = max; fMultStep = step;} // - void SetTagDirectory(char* dirname) {fTagDirectory = dirname;}; - virtual Int_t BinNumber() {return fBinNumber;} + void SetTagDirectory(const char* dirname) {fTagDirectory = dirname;}; + virtual Int_t BinNumber() const {return fBinNumber;} private: AliEventPoolOTF(const AliEventPoolOTF& obj); @@ -45,7 +45,7 @@ class AliEventPoolOTF : public AliVEventPool AliLHCTagCuts* fLHCCuts; // LHC cuts AliDetectorTagCuts* fDetectorCuts; // Detector cuts AliEventTagCuts* fEventCuts; // Event cuts - char* fTagDirectory; // Directory with local tag files + const char* fTagDirectory; // Directory with local tag files Int_t fMultMin; // Minimum multiplicity Int_t fMultMax; // Maximum multiplicity Int_t fMultStep; // Multiplicity step-size diff --git a/EMCAL/AliEMCALGeometry.cxx b/EMCAL/AliEMCALGeometry.cxx index a99d84b9f79..e9f5eeee852 100644 --- a/EMCAL/AliEMCALGeometry.cxx +++ b/EMCAL/AliEMCALGeometry.cxx @@ -79,7 +79,7 @@ ClassImp(AliEMCALGeometry) // these initialisations are needed for a singleton AliEMCALGeometry *AliEMCALGeometry::fgGeom = 0; Bool_t AliEMCALGeometry::fgInit = kFALSE; -Char_t* AliEMCALGeometry::fgDefaultGeometryName = "EMCAL_COMPLETE"; +const Char_t* AliEMCALGeometry::fgDefaultGeometryName = "EMCAL_COMPLETE"; // // Usage: // You can create the AliEMCALGeometry object independently from anything. diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h index decc5a0274f..668632ce9b8 100644 --- a/EMCAL/AliEMCALGeometry.h +++ b/EMCAL/AliEMCALGeometry.h @@ -57,7 +57,7 @@ public: // General // Bool_t IsInitialized(void) const { return fgInit ; } - static Char_t* GetDefaultGeometryName() {return fgDefaultGeometryName;} + static const Char_t* GetDefaultGeometryName() {return fgDefaultGeometryName;} void PrintGeometry(); //*MENU* void PrintCellIndexes(Int_t absId=0, int pri=0, char *tit=""); //*MENU* virtual void Browse(TBrowser* b); @@ -87,7 +87,7 @@ public: ////////////////////////////////////// // Return EMCAL geometrical parameters // - Char_t* GetNameOfEMCALEnvelope() const { Char_t* env = "XEN1"; return env ;} + const Char_t* GetNameOfEMCALEnvelope() const { const Char_t* env = "XEN1"; return env ;} Float_t GetArm1PhiMin() const { return fArm1PhiMin ; } Float_t GetArm1PhiMax() const { return fArm1PhiMax ; } Float_t GetArm1EtaMin() const { return fArm1EtaMin;} @@ -264,12 +264,12 @@ private: //Member data static AliEMCALGeometry * fgGeom; // pointer to the unique instance of the singleton static Bool_t fgInit; // Tells if geometry has been succesfully set up. - static Char_t* fgDefaultGeometryName; // Default name of geometry + static const Char_t* fgDefaultGeometryName; // Default name of geometry TString fGeoName; //geometry name TObjArray *fArrayOpts; //! array of geometry options - char *fAdditionalOpts[6]; //! some additional options for the geometry type and name + const char *fAdditionalOpts[6]; //! some additional options for the geometry type and name int fNAdditionalOpts; //! size of additional options parameter Float_t fECPbRadThickness; // cm, Thickness of the Pb radiators diff --git a/EMCAL/AliEMCALHistoUtilities.cxx b/EMCAL/AliEMCALHistoUtilities.cxx index fb49798bbdc..37c30794c83 100644 --- a/EMCAL/AliEMCALHistoUtilities.cxx +++ b/EMCAL/AliEMCALHistoUtilities.cxx @@ -263,7 +263,7 @@ const char *optFit, const char *fun) TGraphErrors *AliEMCALHistoUtilities::DrawGraphErrors(const Int_t n,Double_t *x,Double_t *y,Double_t *ex, Double_t *ey, Int_t markerColor, Int_t markerStyle, const char* opt, const char* tit, -const char* xTit,char* yTit, Int_t ifun, const char *optFit, const char *fun) +const char* xTit,const char* yTit, Int_t ifun, const char *optFit, const char *fun) { // Oct 15, 2007 printf("AliEMCALHistoUtilities::drawGraphErrors started \n"); diff --git a/EMCAL/AliEMCALHistoUtilities.h b/EMCAL/AliEMCALHistoUtilities.h index 36992bfab81..95106147fa1 100644 --- a/EMCAL/AliEMCALHistoUtilities.h +++ b/EMCAL/AliEMCALHistoUtilities.h @@ -54,7 +54,7 @@ class AliEMCALHistoUtilities: public TNamed { static TGraphErrors *DrawGraphErrors(const Int_t n=4,Double_t *x=0,Double_t *y=0,Double_t *ex=0, Double_t *ey=0, Int_t markerColor=4,Int_t markerStyle=4, const char* opt="", const char* tit="", const char* xTit=" jet E_{t} ", - char* yTit="", Int_t ifun=0, const char *optFit="W+", const char *fun=""); + const char* yTit="", Int_t ifun=0, const char *optFit="W+", const char *fun=""); // TChain static void InitChain(TChain *chain=0, const char* nameListOfFiles=0, Int_t nFileMax=0); static AliRunLoader* InitKinematics(const Int_t nev=0, const char* galiceName="galice.root"); diff --git a/EMCAL/AliEMCALv0.cxx b/EMCAL/AliEMCALv0.cxx index 13d43ab0014..169f3154b51 100644 --- a/EMCAL/AliEMCALv0.cxx +++ b/EMCAL/AliEMCALv0.cxx @@ -111,7 +111,7 @@ void AliEMCALv0::BuildGeometry() // Define the shape of the Calorimeter TNode * top = gAlice->GetGeometry()->GetNode("alice") ; // See AliceGeom/Nodes TNode * envelopNode = 0; - char *envn = "Envelop1"; + const char *envn = "Envelop1"; if(gn.Contains("WSUC")) { envelopNode = BuildGeometryOfWSUC(); } else { // Shish-kebab now for compact and TRD1 cases (ALIC) @@ -152,7 +152,7 @@ TNode *AliEMCALv0::BuildGeometryOfWSUC() top->cd(); TNode *envelopNode = 0; - char *name = ""; + const char *name = ""; /* name = "WSUC"; new TBRIK(name, "WSUC(XEN1 in Geant)","void",fEnvelop1[0],fEnvelop1[1],fEnvelop1[2]); diff --git a/EMCAL/AliEMCALv2.cxx b/EMCAL/AliEMCALv2.cxx index ebc5284540d..a11177d2187 100644 --- a/EMCAL/AliEMCALv2.cxx +++ b/EMCAL/AliEMCALv2.cxx @@ -130,7 +130,7 @@ void AliEMCALv2::StepManager(void){ static TString curVolName; static int supModuleNumber, moduleNumber, yNumber, xNumber, absid; static int keyGeom=1; //real TRD1 geometry - static char *vn = "SCMX"; // Apr 13, 2006 - only TRD1 case now + static const char *vn = "SCMX"; // Apr 13, 2006 - only TRD1 case now static int nSMOP[7]={1,3,5,7,9,11}; // 30-mar-05 static int nSMON[7]={2,4,6,8,10,12}; static Float_t depositedEnergy=0.0; @@ -295,7 +295,7 @@ void AliEMCALv2::DrawCalorimeterCut(const char *name, int axis, double dcut) st += ", zcut, "; st += name; - char *optShad = "on", *optHide="on"; + const char *optShad = "on", *optHide="on"; double cxy=0.02; if (axis==1) { dcut = 0.; @@ -322,7 +322,7 @@ void AliEMCALv2::DrawSuperModuleCut(const char *name, int axis, double dcut, int // Size of tower is 5.6x5.6x24.8 (25.0); cut on Z axiz TString sn(GetGeometry()->GetName()); sn.ToUpper(); - char *tit[3]={"xcut", "ycut", "zcut"}; + const char *tit[3]={"xcut", "ycut", "zcut"}; if(axis<1) axis=1; if(axis>3) axis=3; gMC->Gsatt("*", "seen", 0); @@ -332,7 +332,7 @@ void AliEMCALv2::DrawSuperModuleCut(const char *name, int axis, double dcut, int SetVolumeAttributes(name, 1, 5, fill); // yellow double cxy=0.055, x0=10., y0=10.; - char *optShad = "on", *optHide="on"; + const char *optShad = "on", *optHide="on"; SetVolumeAttributes("STPL", 1, 3, fill); // green if (axis==1) { gMC->Gsatt("STPL", "seen", 0); diff --git a/EMCAL/Calib/AliEMCALCalibCoefs.cxx b/EMCAL/Calib/AliEMCALCalibCoefs.cxx index 6c2e5f14377..74638818b0e 100644 --- a/EMCAL/Calib/AliEMCALCalibCoefs.cxx +++ b/EMCAL/Calib/AliEMCALCalibCoefs.cxx @@ -118,8 +118,8 @@ AliEMCALCalibCoefs* AliEMCALCalibCoefs::GetCalibTableFromDb(const char *tn, AliE // See ~/macros/ALICE/sim.C for choice of CDB // Get calib. table which was used than calculated rec.points // - static char *calibType = "EMCAL/Calib/*"; - static char *calibTypeData = "EMCAL/Calib/Data"; + static const char *calibType = "EMCAL/Calib/*"; + static const char *calibTypeData = "EMCAL/Calib/Data"; // Initial cc calData[0] = 0; @@ -190,7 +190,7 @@ const char* coment) Int_t firstRun = 0; Int_t lastRun = 10; Int_t beamPeriod = 1; - char* objFormat = ""; + const char* objFormat = ""; caldata = new AliEMCALCalibData("EMCAL"); caldata->SetTitle(coment); diff --git a/EMCAL/Calib/AliEMCALPi0Calibration.cxx b/EMCAL/Calib/AliEMCALPi0Calibration.cxx index ce0c52afb18..bb05c2d0d0c 100644 --- a/EMCAL/Calib/AliEMCALPi0Calibration.cxx +++ b/EMCAL/Calib/AliEMCALPi0Calibration.cxx @@ -94,7 +94,7 @@ Double_t AliEMCALPi0Calibration::fgSlopePhiShift = 0.01; // ?? just guess AliEMCALFolder* AliEMCALPi0Calibration::fgEMCAL = 0; AliEMCALFolder* AliEMCALPi0Calibration::fgEMCALOld = 0; -Char_t **AliEMCALPi0Calibration::fgAnaOpt=0; +const Char_t **AliEMCALPi0Calibration::fgAnaOpt=0; Int_t AliEMCALPi0Calibration::fgNanaOpt = 0; enum keyOpt{ kCORR1, @@ -150,7 +150,7 @@ AliEMCALPi0Calibration::AliEMCALPi0Calibration(const char* name) : // // Constructor. Initialization of pointers // - Char_t *anaOpt[]={ + const Char_t *anaOpt[]={ "CORR1", // GetCorrectedEnergyForGamma1(Double_t eRec); "RECALIB", "IDEAL", @@ -162,7 +162,7 @@ AliEMCALPi0Calibration::AliEMCALPi0Calibration(const char* name) : }; fgNanaOpt = sizeof(anaOpt) / sizeof(Char_t*); - fgAnaOpt = new Char_t*[fgNanaOpt]; + fgAnaOpt = new const Char_t*[fgNanaOpt]; for(int i=0; i indName; + map indName; indName[0] = "eff.mass"; indName[3] = "mass of #pi_{0}"; indName[4] = "resolution of #pi_{0}"; @@ -1091,7 +1091,7 @@ TCanvas *AliEMCALPi0Calibration::Linearity(TList *l, int ifun) hErecOverEin->SetMaximum(1.001); } Int_t markerColor=1; - char *fun="", *optFit=""; + const char *fun="", *optFit=""; TF1 *f = 0; if(0) { if(ifun==-5) { diff --git a/EMCAL/Calib/AliEMCALPi0Calibration.h b/EMCAL/Calib/AliEMCALPi0Calibration.h index 8510510ce5a..e5274b5efbd 100644 --- a/EMCAL/Calib/AliEMCALPi0Calibration.h +++ b/EMCAL/Calib/AliEMCALPi0Calibration.h @@ -145,7 +145,7 @@ class AliEMCALPi0Calibration : public AliAnalysisTaskSE { // static AliEMCALGeometry* fgEmcalGeo; //! pointer to EMCAL geometry static Int_t fgNmaxCell; //! max number of cells - static Char_t **fgAnaOpt; //! aray of options + static const Char_t **fgAnaOpt; //! aray of options static Int_t fgNanaOpt; //! number of options ClassDef(AliEMCALPi0Calibration, 1); diff --git a/ESDCheck/AliFMDQATask.cxx b/ESDCheck/AliFMDQATask.cxx index 4aa58f95865..956d199dc64 100644 --- a/ESDCheck/AliFMDQATask.cxx +++ b/ESDCheck/AliFMDQATask.cxx @@ -276,18 +276,18 @@ Bool_t AliFMDQATask::TestHisto(TH1D * hTest) const } Bool_t ret = kFALSE ; - Char_t * test = "not OK"; - Char_t * test2 = "not OK"; + const Char_t * test = "not OK"; + const Char_t * test2 = "not OK"; if(chiSq < chiMax && chiSq > chiLow) test = "OK" ; if(mpv > 0.6 && mpv < 1) test2 = "OK" ; - if(test == "OK" && test2 == "OK") + if(!strcmp(test,"OK") && !strcmp(test2,"OK")) ret = kTRUE; - if(test == "not OK" || test2 == "not OK") { + if(!strcmp(test,"not OK") || !strcmp(test2,"not OK")) { AliWarning("Bad fit results") ; printf("Detector : %s\n", hTest->GetName()) ; printf("Landau fit Chi Square / NDF = %f / %d which is %s\n", chiSq*ndf, ndf, test) ; diff --git a/ESDCheck/AliTRDQATask.cxx b/ESDCheck/AliTRDQATask.cxx index 24e45c298b4..3c691d95116 100644 --- a/ESDCheck/AliTRDQATask.cxx +++ b/ESDCheck/AliTRDQATask.cxx @@ -446,7 +446,7 @@ void AliTRDQATask::Terminate(Option_t *) } //______________________________________________________________________________ -const int AliTRDQATask::GetSector(const double alpha) const +int AliTRDQATask::GetSector(const double alpha) const { // Gets the sector number @@ -456,7 +456,7 @@ const int AliTRDQATask::GetSector(const double alpha) const } //______________________________________________________________________________ -const int AliTRDQATask::CheckSector(const int sector) const +int AliTRDQATask::CheckSector(const int sector) const { // Checks the sector number const int knSec = 8; diff --git a/ESDCheck/AliTRDQATask.h b/ESDCheck/AliTRDQATask.h index ccecd053a5c..5d83be324a0 100644 --- a/ESDCheck/AliTRDQATask.h +++ b/ESDCheck/AliTRDQATask.h @@ -30,8 +30,8 @@ public: private: - const int GetSector(const double alpha) const; - const int CheckSector(const int sector) const; + int GetSector(const double alpha) const; + int CheckSector(const int sector) const; void CalculateEff(); void DrawESD() const ; void DrawGeoESD() const ; diff --git a/EVE/EveDet/AliEveTRDData.cxx b/EVE/EveDet/AliEveTRDData.cxx index 878570bd3df..50e5473f7f0 100644 --- a/EVE/EveDet/AliEveTRDData.cxx +++ b/EVE/EveDet/AliEveTRDData.cxx @@ -442,7 +442,7 @@ void AliEveTRDTrack::SetStatus(UChar_t s) SetLineWidth(2); } - Char_t *model = "line"; + const Char_t *model = "line"; if(!TESTBIT(s, kTrackCosmics)){ if(TESTBIT(s, kTrackModel)) model = "kalman"; else model = "rieman"; diff --git a/EVE/EveDet/AliEveTRDLoaderManager.cxx b/EVE/EveDet/AliEveTRDLoaderManager.cxx index 57cb1c35681..5eaa217ff1f 100644 --- a/EVE/EveDet/AliEveTRDLoaderManager.cxx +++ b/EVE/EveDet/AliEveTRDLoaderManager.cxx @@ -169,7 +169,7 @@ void AliEveTRDLoaderManagerEditor::Add(Char_t *name) Resize(GetDefaultSize()); MapWindow(); - char *title[] = {"MC loader", "Single file loader", "Raw data loader"}; + const char *title[] = {"MC loader", "Single file loader", "Raw data loader"}; // char *color[] = {"#ff0000", "#0000ff", "#59d454"}; int id = fSelector->GetSelected(), type; switch(id){ diff --git a/EVE/EveDet/AliEveTRDTrackListEditor.cxx b/EVE/EveDet/AliEveTRDTrackListEditor.cxx index 4777f0135ba..991ae6b2bb9 100644 --- a/EVE/EveDet/AliEveTRDTrackListEditor.cxx +++ b/EVE/EveDet/AliEveTRDTrackListEditor.cxx @@ -1189,7 +1189,7 @@ AliEveTRDMacroWizzard::AliEveTRDMacroWizzard(const TGWindow* p) fCombo->Connect("Selected(Int_t)", "AliEveTRDMacroWizzard", this, "Create(Int_t)"); } -Char_t *fIncludes = +const Char_t *fIncludes = "#if !defined(__CINT__) || defined(__MAKECINT__)\n" "#include \n" "#include \n" @@ -1199,7 +1199,7 @@ Char_t *fIncludes = "#include \n" "#endif\n"; -Char_t *fMacroTemplate[7] = { +const Char_t *fMacroTemplate[7] = { "" ," if (!track) return kFALSE;\n" diff --git a/HLT/BASE/AliHLTHOMERLibManager.cxx b/HLT/BASE/AliHLTHOMERLibManager.cxx index b9ddfac68e8..8707160f3d2 100644 --- a/HLT/BASE/AliHLTHOMERLibManager.cxx +++ b/HLT/BASE/AliHLTHOMERLibManager.cxx @@ -180,11 +180,11 @@ int AliHLTHOMERLibManager::LoadHOMERLibrary() typedef void (*CompileInfo)( char*& date, char*& time); CompileInfo fctInfo=(CompileInfo)gSystem->DynFindSymbol(*library, "CompileInfo"); if (fctInfo) { - char* date=""; - char* time=""; + char* date=0; + char* time=0; (*fctInfo)(date, time); - if (!date) date="unknown"; - if (!time) time="unknown"; + if (!date) {date=new Char_t[8]; strcpy(date,"unknown");} + if (!time) {time=new Char_t[8]; strcpy(time,"unknown");} //HLTInfo("%s build on %s (%s)", *library, date, time); } else { //HLTInfo("no build info available for %s", *library); diff --git a/HLT/TPCLib/AliHLTTPCMerger.cxx b/HLT/TPCLib/AliHLTTPCMerger.cxx index da6c2037247..7337808651c 100644 --- a/HLT/TPCLib/AliHLTTPCMerger.cxx +++ b/HLT/TPCLib/AliHLTTPCMerger.cxx @@ -72,7 +72,7 @@ AliHLTTPCMerger::~AliHLTTPCMerger() DeleteArray(); } -void AliHLTTPCMerger::InitMerger(Int_t ntrackarrays,Char_t *tracktype) +void AliHLTTPCMerger::InitMerger(Int_t ntrackarrays,const Char_t *tracktype) { //Used to setup all arrays diff --git a/HLT/TPCLib/AliHLTTPCMerger.h b/HLT/TPCLib/AliHLTTPCMerger.h index 41ec0b32c35..4ff562453ca 100644 --- a/HLT/TPCLib/AliHLTTPCMerger.h +++ b/HLT/TPCLib/AliHLTTPCMerger.h @@ -67,7 +67,7 @@ class AliHLTTPCMerger { AliHLTTPCVertex *fVertex; //! Bool_t f2Global; //global Bool_t Is2Global(Bool_t is){f2Global=is;return f2Global;} - void InitMerger(Int_t ntrackarrays,Char_t *tracktype="AliHLTTPCTrack"); + void InitMerger(Int_t ntrackarrays,const Char_t *tracktype="AliHLTTPCTrack"); private: /** copy constructor prohibited */ diff --git a/HLT/TPCLib/AliHLTTPCTrackArray.cxx b/HLT/TPCLib/AliHLTTPCTrackArray.cxx index ab63902843e..43ba409f1c1 100644 --- a/HLT/TPCLib/AliHLTTPCTrackArray.cxx +++ b/HLT/TPCLib/AliHLTTPCTrackArray.cxx @@ -71,7 +71,7 @@ AliHLTTPCTrackArray::AliHLTTPCTrackArray(Int_t ntrack) SetSize(ntrack); } -AliHLTTPCTrackArray::AliHLTTPCTrackArray(char* tracktype,Int_t ntrack) +AliHLTTPCTrackArray::AliHLTTPCTrackArray(const char* tracktype,Int_t ntrack) : fTrackType('t'), fSize(0), @@ -90,7 +90,7 @@ AliHLTTPCTrackArray::AliHLTTPCTrackArray(char* tracktype,Int_t ntrack) SetSize(ntrack); } -AliHLTTPCTrackArray::AliHLTTPCTrackArray(char* tracktype) +AliHLTTPCTrackArray::AliHLTTPCTrackArray(const char* tracktype) : fTrackType('t'), fSize(0), diff --git a/HLT/TPCLib/AliHLTTPCTrackArray.h b/HLT/TPCLib/AliHLTTPCTrackArray.h index c99fd4bdad3..77a91b0d084 100644 --- a/HLT/TPCLib/AliHLTTPCTrackArray.h +++ b/HLT/TPCLib/AliHLTTPCTrackArray.h @@ -46,7 +46,7 @@ class AliHLTTPCTrackArray { * - AliHLTTPCModelTrack -> 'm' * @param ntrack initial size */ - AliHLTTPCTrackArray(char* tracktype,Int_t ntrack); + AliHLTTPCTrackArray(const char* tracktype,Int_t ntrack); /** * constructor * @param tracktype string describing type, one of @@ -55,7 +55,7 @@ class AliHLTTPCTrackArray { * - AliHLTTPCHoughTrack -> 'h' * - AliHLTTPCModelTrack -> 'm' */ - AliHLTTPCTrackArray(char* tracktype); + AliHLTTPCTrackArray(const char* tracktype); /** destructor */ virtual ~AliHLTTPCTrackArray(); diff --git a/HMPID/AliHMPIDHit.cxx b/HMPID/AliHMPIDHit.cxx index 54888d4b4f3..7d6e3a53b7e 100644 --- a/HMPID/AliHMPIDHit.cxx +++ b/HMPID/AliHMPIDHit.cxx @@ -56,7 +56,7 @@ void AliHMPIDHit::Hit2Sdi(TClonesArray *pSdiLst,Int_t iHow)const void AliHMPIDHit::Print(Option_t *opt)const { //Print hit - char *sPart=Form("pid=%i",Pid()); + const char *sPart=Form("pid=%i",Pid()); switch(Pid()){ case kProton: sPart="p+ ";break; case kProtonBar: sPart="p- ";break; diff --git a/HMPID/AliHMPIDRawStream.h b/HMPID/AliHMPIDRawStream.h index 1af2d443d94..20d8bb98f37 100644 --- a/HMPID/AliHMPIDRawStream.h +++ b/HMPID/AliHMPIDRawStream.h @@ -46,7 +46,7 @@ class AliHMPIDRawStream: public TObject { Int_t PadPcX ( Int_t ddl,Int_t row,Int_t dil,Int_t pad ) {return AliHMPIDParam::A2X(GetPad(ddl,row,dil,pad));} //pad pc x # 0..79 Int_t PadPcY ( Int_t ddl,Int_t row,Int_t dil,Int_t pad ) {return AliHMPIDParam::A2Y(GetPad(ddl,row,dil,pad));} //pad pc y # 0..47 - static inline Char_t* GetErrName(Int_t eType); + static inline const Char_t* GetErrName(Int_t eType); inline Bool_t SetZeroSup (Bool_t isSup); inline Bool_t GetZeroSup()const; inline Int_t GetErrors(Int_t ddl,Int_t eType)const; //Get errors and occurance @@ -374,16 +374,16 @@ Int_t AliHMPIDRawStream::GetErrors(Int_t ddl,Int_t eType)const else return fNumOfErr[ddl][eType]; } //GetErrors() //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Char_t* AliHMPIDRawStream::GetErrName(Int_t eType) +const Char_t* AliHMPIDRawStream::GetErrName(Int_t eType) { // Return the name of the error for a given error tye during raw data reading // Arguments: errorType // Returns: error or -999 if error Type does not exist - Char_t *eName[]={ "kRawDataSizeErr", "kRowMarkerErr" , "kWrongRowErr" , "kWrongDilogicErr", + const Char_t *eName[]={ "kRawDataSizeErr", "kRowMarkerErr" , "kWrongRowErr" , "kWrongDilogicErr", "kWrongPadErr" , "kEoEFlagErr" , "kEoESizeErr" , "kEoEDILOGICErr", "kEoERowErr" , "kBadSegWordErr", "kWrongSegErr" , "kRowMarkerSizeErr", "kPedQZero" , "kSumErr" }; - Char_t *eNoErr="NotDefinedErrorType"; + const Char_t *eNoErr="NotDefinedErrorType"; if(eType<0 || eType>kSumErr) return eNoErr; else return eName[eType]; }//GetErrName() diff --git a/HMPID/AliHMPIDv3.cxx b/HMPID/AliHMPIDv3.cxx index 12356d5792e..73cfeb6d10e 100644 --- a/HMPID/AliHMPIDv3.cxx +++ b/HMPID/AliHMPIDv3.cxx @@ -1231,7 +1231,7 @@ return cradle; }//CreateCradle() -TGeoVolume * AliHMPIDv3::CradleBaseVolume(TGeoMedium *med, Double_t l[7],char *name) +TGeoVolume * AliHMPIDv3::CradleBaseVolume(TGeoMedium *med, Double_t l[7],const char *name) { /* The trapezoid is build in the xy plane diff --git a/HMPID/AliHMPIDv3.h b/HMPID/AliHMPIDv3.h index 3cebfc2826e..0779abdfb6d 100644 --- a/HMPID/AliHMPIDv3.h +++ b/HMPID/AliHMPIDv3.h @@ -48,7 +48,7 @@ static void IdealPositionCradle(Int_t iCh,TGeoHMatrix *m); static void TestGeom ( ); //tests the validity of geometry static void TestPoint (Int_t ch,Float_t x,Float_t y ); //tests the validity of geometry TGeoVolume* CreateChamber (Int_t number ); //chamber geometry building - TGeoVolume* CradleBaseVolume ( TGeoMedium *med, Double_t l[7], char *name); //base topology of the cradle elements + TGeoVolume* CradleBaseVolume ( TGeoMedium *med, Double_t l[7], const char *name); //base topology of the cradle elements TGeoVolume* CreateCradle ( ); //cradle geometry building protected: enum EMedia {kAir=1,kRoha=2,kSiO2=3,kC6F14=4,kCH4=5,kCsI=6,kAl=7,kCu=8,kW=9,kNeo=10,kAr=11}; //media ids, used for geometry creation diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index 2d112cc7fc0..d030bb60325 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -370,7 +370,7 @@ void AliITS:: MakeBranchInTreeD(TTree* treeD, const char* file){ fDetTypeSim->SetLoader((AliITSLoader*)fLoader); const Char_t *det[3] = {"SPD","SDD","SSD"}; - Char_t* digclass; + const Char_t* digclass; Int_t buffersize = 4000; Char_t branchname[30]; diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx index d0b93b7ca49..9d75a82865d 100644 --- a/ITS/AliITSDetTypeRec.cxx +++ b/ITS/AliITSDetTypeRec.cxx @@ -328,7 +328,7 @@ void AliITSDetTypeRec::SetTreeAddressD(TTree *treeD){ const char *det[4] = {"SPD","SDD","SSD","ITS"}; TBranch *branch; - Char_t* digclass; + const Char_t* digclass; Int_t i; char branchname[30]; diff --git a/ITS/AliITSDetTypeRec.h b/ITS/AliITSDetTypeRec.h index 4683eafe54f..7d392219698 100644 --- a/ITS/AliITSDetTypeRec.h +++ b/ITS/AliITSDetTypeRec.h @@ -70,19 +70,19 @@ class AliITSDetTypeRec : public TObject { else return 1.; } - virtual void SetDigitClassName(Int_t i,Char_t *digit) + virtual void SetDigitClassName(Int_t i,const Char_t *digit) {fDigClassName[i]=digit;} - virtual void SetClusterClassName(Int_t i,Char_t *cluster) + virtual void SetClusterClassName(Int_t i,const Char_t *cluster) {fClusterClassName[i]=cluster;} - virtual void SetRecPointClassName(Int_t i,Char_t *recpoint) + virtual void SetRecPointClassName(Int_t i,const Char_t *recpoint) {fRecPointClassName[i]=recpoint;} virtual void SetLoadOnlySPDCalib(Bool_t opt=kFALSE) {fLoadOnlySPDCalib=opt;} - Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];} - Char_t* GetClusterClassName(Int_t i) const {return fClusterClassName[i];} - Char_t* GetRecPointClassName(Int_t i) const {return fRecPointClassName[i];} + const Char_t* GetDigitClassName(Int_t i) const {return fDigClassName[i];} + const Char_t* GetClusterClassName(Int_t i) const {return fClusterClassName[i];} + const Char_t* GetRecPointClassName(Int_t i) const {return fRecPointClassName[i];} TObjArray* GetDigits() const {return fDigits;} Int_t *Ndtype() {return fNdtype;} @@ -149,9 +149,9 @@ class AliITSDetTypeRec : public TObject { Float_t fAveGainSDD; //! Average gain of SDD good anodes Bool_t fIsHLTmodeC; //! flag for HLT mode C status (used by SDD) Int_t *fNdtype; //! detector types - Char_t* fClusterClassName[3]; //! String with Cluster class name - Char_t* fDigClassName[3]; //! String with digit class name. - Char_t* fRecPointClassName[3];//! String with RecPoint class name + const Char_t* fClusterClassName[3]; //! String with Cluster class name + const Char_t* fDigClassName[3]; //! String with digit class name. + const Char_t* fRecPointClassName[3];//! String with RecPoint class name TObjArray *fCtype; //! List of clusters Int_t *fNctype; //[fNDetTypes] Num. of clust. per type of det. diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx index 911d6f5b15d..31427a19d04 100644 --- a/ITS/AliITSDetTypeSim.cxx +++ b/ITS/AliITSDetTypeSim.cxx @@ -669,7 +669,7 @@ void AliITSDetTypeSim::SetDefaultSimulation(){ } } //___________________________________________________________________ -void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, Char_t* name){ +void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, const Char_t* name){ // Set branch address for the ITS summable digits Trees. char branchname[30]; @@ -684,7 +684,7 @@ void AliITSDetTypeSim::SetTreeAddressS(TTree* treeS, Char_t* name){ } //___________________________________________________________________ -void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, Char_t* name){ +void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, const Char_t* name){ // Set branch address for the digit Trees. const char *det[3] = {"SPD","SDD","SSD"}; @@ -699,7 +699,7 @@ void AliITSDetTypeSim::SetTreeAddressD(TTree* treeD, Char_t* name){ fDigits = new TObjArray(fgkNdettypes); } for(Int_t i=0;i SDD module number TString fHitClassName; //! String with Hit class name TString fSDigClassName;//! String with SDigit class name. - Char_t* fDigClassName[3]; //! String with digit class name. + const Char_t* fDigClassName[3]; //! String with digit class name. AliITSLoader* fLoader; //! loader Bool_t fFirstcall; //! flag Bool_t fIsHLTmodeC; //! flag for HLT mode C status (used by SDD) diff --git a/ITS/AliITSInitGeometry.cxx b/ITS/AliITSInitGeometry.cxx index 34bebcd7b8c..fa04684c615 100644 --- a/ITS/AliITSInitGeometry.cxx +++ b/ITS/AliITSInitGeometry.cxx @@ -799,7 +799,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){ const AliITSDetector kIdet[6] = {kSPD,kSPD,kSDD,kSDD,kSSD,kSSD}; const TString kPathbase = "/ALIC_1/ITSV_1/"; - char *pathSPDsens1, *pathSPDsens2; + const char *pathSPDsens1, *pathSPDsens2; if (SPDIsTGeoNative()) { pathSPDsens1="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay1-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay1-Ladder_%d/ITSSPDlay1-sensor_1"; pathSPDsens2="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay2-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay2-Ladder_%d/ITSSPDlay2-sensor_1"; @@ -808,7 +808,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){ pathSPDsens2 = "%sITSD_1/IT12_1/I12B_%d/I20B_%d/L2H-STAVE%d_1/I1D7_%d/I1D1_1/ITS2_1"; } - char *pathSDDsens1, *pathSDDsens2; + const char *pathSDDsens1, *pathSDDsens2; if (SDDIsTGeoNative()) { pathSDDsens1 = "%sITSsddLayer3_1/ITSsddLadd_%d/ITSsddSensor3_%d/ITSsddWafer3_%d/ITSsddSensitivL3_1"; pathSDDsens2 = "%sITSsddLayer4_1/ITSsddLadd_%d/ITSsddSensor4_%d/ITSsddWafer4_%d/ITSsddSensitivL4_1"; @@ -817,7 +817,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){ pathSDDsens2 = "%sITSD_1/IT34_1/I005_%d/I402_%d/ITS4_%d"; } - char *pathSSDsens1, *pathSSDsens2; + const char *pathSSDsens1, *pathSSDsens2; if (SSDIsTGeoNative()) { pathSSDsens1 = "%sITSssdLayer5_1/ITSssdLay5Ladd_%d/ITSssdSensor5_%d/ITSssdSensitivL5_1"; pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSssdSensor6_%d/ITSssdSensitivL6_1"; diff --git a/ITS/AliITSv11GeometrySSD.cxx b/ITS/AliITSv11GeometrySSD.cxx index bd6445dac22..c7c421d6d1f 100644 --- a/ITS/AliITSv11GeometrySSD.cxx +++ b/ITS/AliITSv11GeometrySSD.cxx @@ -2018,9 +2018,9 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberSupportList(){ for(Int_t j=0; jX(), (GetReflection(vertexposition[0][j],param))->Y()); - char* carbonfibersupportshapename[kshapesnumber] = + const char* carbonfibersupportshapename[kshapesnumber] = {"CarbonFiberSupportShape1","CarbonFiberSupportShape2"}; - char* carbonfibersupportname[kshapesnumber] = + const char* carbonfibersupportname[kshapesnumber] = {"CarbonFiberSupport1","CarbonFiberSupport2"}; TGeoArb8* carbonfibersupportshape[kshapesnumber]; TGeoVolume* carbonfibersupport[kshapesnumber]; @@ -2119,9 +2119,9 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberLowerSupportList(){ vertexposition[1][2] = new TVector3(0.,fgkCarbonFiberLowerSupportVolumePosition[0]); vertexposition[1][3] = new TVector3(fgkCarbonFiberTriangleLength, fgkCarbonFiberLowerSupportVolumePosition[1]); - char* carbonfiberlowersupportshapename[kshapesnumber] = + const char* carbonfiberlowersupportshapename[kshapesnumber] = {"CarbonFiberLowerSupportShape1","CarbonFiberLowerSupportShape2"}; - char* carbonfiberlowersupportname[kshapesnumber] = + const char* carbonfiberlowersupportname[kshapesnumber] = {"CarbonFiberLowerSupport1","CarbonFiberLowerSupport2"}; TGeoArb8* carbonfiberlowersupportshape[kshapesnumber]; TGeoVolume* carbonfiberlowersupport[kshapesnumber]; @@ -4004,7 +4004,7 @@ TList* AliITSv11GeometrySSD::GetLadderCableSegment(Double_t ssdendladdercablelen } Double_t laddercablesegmentwidth[2][2] = {{fgkSSDFlexHeight[0],fgkSSDFlexHeight[0]}, {fgkSSDFlexHeight[1],fgkSSDFlexHeight[1]}}; - char* laddercablesegmentarbshapename[kladdercablesegmentnumber] = + const char* laddercablesegmentarbshapename[kladdercablesegmentnumber] = {"LadderCableSegmentArbShape1","LadderCableSegmentArbShape2"}; TGeoArb8* laddercablesegmentarbshape[kladdercablesegmentnumber]; for(Int_t i = 0; i< kladdercablesegmentnumber; i++) laddercablesegmentarbshape[i] = @@ -7081,7 +7081,7 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){ Double_t radiusmax, Double_t width, Int_t ncables, - char* volname){ + const char* volname){ ///////////////////////////////////////////////////////////// // Generating EndCap High Voltage Tubes ///////////////////////////////////////////////////////////// @@ -8295,7 +8295,7 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){ } //////////////////////////////////////////////////////////////////////////////// TGeoArb8* AliITSv11GeometrySSD::GetArbShape(TVector3* vertexpos[], Double_t* width, - Double_t height, char* shapename, Int_t isign) const{ + Double_t height, const char* shapename, Int_t isign) const{ ///////////////////////////////////////////////////////////// // Method generating an Arb shape ///////////////////////////////////////////////////////////// diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h index d023d44e99f..2bafb12c9c1 100644 --- a/ITS/AliITSv11GeometrySSD.h +++ b/ITS/AliITSv11GeometrySSD.h @@ -449,12 +449,12 @@ private: TGeoVolume** EndCapSupport(); // End Cap Support Layer 5 and Layer 6 void SetEndCapSupportAssembly(); // EndCap Support + End Cap Layer 5 and 6 TGeoVolume* GetEndCapEffectiveCables(Double_t radiusmin, Double_t radiusmax, - Double_t width,Int_t ncables,char* volname); // End Cap Effective HV Cables + Double_t width,Int_t ncables,const char* volname); // End Cap Effective HV Cables TGeoXtru* GetArcShape(Double_t phi, Double_t rmin, Double_t rmax, Int_t nedges, Double_t height); //Auxiliary Method for Arc Shape TGeoArb8* GetArbShape(TVector3* vertexpos[],Double_t* width, - Double_t height,char* shapename,Int_t isign = 1) const; + Double_t height,const char* shapename,Int_t isign = 1) const; // Method generating an Arb shape TGeoShape* GetScrewShape(Double_t* radius,Int_t* edgesnumber,Double_t* section) const;// Method Generating the Screw Shape TGeoShape* GetHoleShape(Double_t radius, Int_t nedges, Double_t *section) const;// Method Generating the Hole Shape diff --git a/ITS/AliITSv11GeometrySupport.cxx b/ITS/AliITSv11GeometrySupport.cxx index ad974ea5993..7eb1f4c1b5b 100644 --- a/ITS/AliITSv11GeometrySupport.cxx +++ b/ITS/AliITSv11GeometrySupport.cxx @@ -2799,7 +2799,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth, } // end for i if(GetDebug(1)) for(i=0;iGfmate(idtmed[fTarg],ssss,a,z,dens,radl,absl,ubuf,nbuf); Info("CreateGeometry","Target A=%f, Z=%f, dens=%f",a,z,dens); diff --git a/JETAN/AliJetAnalysis.cxx b/JETAN/AliJetAnalysis.cxx index bf3a7d51f50..95605aa7399 100644 --- a/JETAN/AliJetAnalysis.cxx +++ b/JETAN/AliJetAnalysis.cxx @@ -46,7 +46,7 @@ AliJetAnalysis::AliJetAnalysis(): fReaderHeader(0x0), fDirectory(0x0), fBkgdDirectory(0x0), - fFile(0x0), + fFile("anaJets.root"), fEventMin(0), fEventMax(-1), fRunMin(0), @@ -144,7 +144,6 @@ AliJetAnalysis::AliJetAnalysis(): fPtEneH(0) { // Default constructor - fFile = "anaJets.root"; // initialize weight for dE/dr histo SetdEdrWeight(); diff --git a/JETAN/AliJetAnalysis.h b/JETAN/AliJetAnalysis.h index 09a6e2e52be..a134050d6c4 100644 --- a/JETAN/AliJetAnalysis.h +++ b/JETAN/AliJetAnalysis.h @@ -79,7 +79,7 @@ class AliJetAnalysis : public TObject {fDirectory = directory;} // directory where file with jets is void SetBkgdDirectory(char* directory) {fBkgdDirectory = directory;} // directory where file with background is - void SetOutputFile(char* file) {fFile = file;} // file where plots will be saved + void SetOutputFile(const char* file) {fFile = file;} // file where plots will be saved void SetPercentage(Float_t p) {fPercentage = p;} // minimum percentage of tracks coming from pythia (very aprox.) void SetEventRange(Int_t imin, Int_t imax) {fEventMin = imin; fEventMax = imax;} // first and last event @@ -114,7 +114,7 @@ class AliJetAnalysis : public TObject char* fReaderHeader; // Reader header char* fDirectory; // Directory char* fBkgdDirectory; // Directory for background - char* fFile; // Output file name + const char* fFile; // Output file name Int_t fEventMin; // Minimum event number Int_t fEventMax; // Maximum event number Int_t fRunMin; // Minimum run number diff --git a/JETAN/AliJetDistributions.cxx b/JETAN/AliJetDistributions.cxx index 406908efb24..a46d7b431b1 100644 --- a/JETAN/AliJetDistributions.cxx +++ b/JETAN/AliJetDistributions.cxx @@ -42,7 +42,7 @@ ClassImp(AliJetDistributions) AliJetDistributions::AliJetDistributions(): fReaderHeader(0x0), fDirectory(0x0), - fFile(0x0), + fFile("jets.root"), fEventMin(0), fEventMax(-1), fRunMin(0), @@ -63,7 +63,6 @@ AliJetDistributions::AliJetDistributions(): fMultH(0) { // Default constructor - fFile = "jets.root"; SetReaderHeader(); } diff --git a/JETAN/AliJetDistributions.h b/JETAN/AliJetDistributions.h index bb8598e83ba..121ad2a2ba6 100644 --- a/JETAN/AliJetDistributions.h +++ b/JETAN/AliJetDistributions.h @@ -34,13 +34,13 @@ class AliJetDistributions : public TObject // Setter void SetDirectory(char* directory) {fDirectory = directory;} - void SetOutputFile(char* file) {fFile = file;} + void SetOutputFile(const char* file) {fFile = file;} void SetPercentage(Float_t p) { fPercentage = p;} void SetEventRange(Int_t imin, Int_t imax) {fEventMin = imin; fEventMax = imax;} void SetRunRange(Int_t imin, Int_t imax) {fRunMin = imin; fRunMax = imax;} void SetPythia(Bool_t f = kFALSE){fPythia = f;} void SetProperties(TH1* h,const char* x, const char* y) const; - void SetReaderHeader(char *s="AliJetKineReaderHeader") {fReaderHeader = s;} + void SetReaderHeader(const char *s="AliJetKineReaderHeader") {fReaderHeader = s;} void SetPartPtCut(Float_t c) { fPartPtCut = c; } void SetDoLeadPart(Bool_t f = kTRUE) {fDoPart = f;} @@ -50,7 +50,7 @@ class AliJetDistributions : public TObject private: char* fReaderHeader;// Reader header char* fDirectory; // Directory - char* fFile ; // Output file name + const char* fFile ; // Output file name Int_t fEventMin; // Minimum event number Int_t fEventMax; // Maximum event number Int_t fRunMin; // Minimum run number diff --git a/JETAN/AliJetDummyGeo.h b/JETAN/AliJetDummyGeo.h index 93adc78a25e..ab5660d447a 100644 --- a/JETAN/AliJetDummyGeo.h +++ b/JETAN/AliJetDummyGeo.h @@ -24,9 +24,9 @@ class AliJetDummyGeo : public TObject AliJetDummyGeo(const AliJetDummyGeo& geom); virtual ~AliJetDummyGeo(); static AliJetDummyGeo* GetInstance() {return new AliJetDummyGeo();} - static AliJetDummyGeo* GetInstance(char* /*name*/, char* /*title*/) + static AliJetDummyGeo* GetInstance(const char* /*name*/, const char* /*title*/) {return new AliJetDummyGeo();} - Char_t* GetNameOfEMCALEnvelope() const {return "XEN1";} + const Char_t* GetNameOfEMCALEnvelope() const {return "XEN1";} Float_t GetEnvelop(Int_t index) const { return fEnvelop[index];} Float_t AngleFromEta(Float_t eta) const { // returns theta in radians for a given pseudorapidity diff --git a/MUON/AliMUONGlobalTriggerBoard.cxx b/MUON/AliMUONGlobalTriggerBoard.cxx index 4a120f9f920..149d6eea679 100644 --- a/MUON/AliMUONGlobalTriggerBoard.cxx +++ b/MUON/AliMUONGlobalTriggerBoard.cxx @@ -134,7 +134,7 @@ void AliMUONGlobalTriggerBoard::Response() } //___________________________________________ -UShort_t AliMUONGlobalTriggerBoard::Algo(UShort_t i, UShort_t j, char *thres) +UShort_t AliMUONGlobalTriggerBoard::Algo(UShort_t i, UShort_t j, const char *thres) { /// global trigger algorithm /// a ,b = reg response = Hpt (+|-|us|ls) | Lpt (+|-|us|ls) diff --git a/MUON/AliMUONGlobalTriggerBoard.h b/MUON/AliMUONGlobalTriggerBoard.h index 7982b798c35..deca812d902 100644 --- a/MUON/AliMUONGlobalTriggerBoard.h +++ b/MUON/AliMUONGlobalTriggerBoard.h @@ -27,7 +27,7 @@ class AliMUONGlobalTriggerBoard : public AliMUONTriggerBoard virtual void Response(); /// response of the algorithm - virtual UShort_t Algo(UShort_t i, UShort_t j, char *thres); + virtual UShort_t Algo(UShort_t i, UShort_t j, const char *thres); /// Reset regional board responses virtual void Reset() {for (Int_t i=0; i<16; i++) fRegionalResponse[i] = 0;} diff --git a/MUON/AliMUONLocalTriggerBoard.cxx b/MUON/AliMUONLocalTriggerBoard.cxx index 57b2b98eefa..3ba21ef982f 100644 --- a/MUON/AliMUONLocalTriggerBoard.cxx +++ b/MUON/AliMUONLocalTriggerBoard.cxx @@ -272,8 +272,8 @@ void AliMUONLocalTriggerBoard::BP(Option_t *option) const printf("===============================================================\n"); printf(" 5432109876543210"); - char *x[4] = {"XMC11","XMC12","XMC21","XMC22"}; - char *s[4] = {" ", + const char *x[4] = {"XMC11","XMC12","XMC21","XMC22"}; + const char *s[4] = {" ", " ", " ", " "}; @@ -1129,7 +1129,7 @@ Int_t AliMUONLocalTriggerBoard::GetI() const Int_t lL = atoi(&l[4]), cC = atoi(&l[2]), sS = (copy=='R') ? +1 : -1; - char *b[4] = {"12", "34", "56", "78"}; + const char *b[4] = {"12", "34", "56", "78"}; Int_t ib = 0; diff --git a/MUON/AliMUONRegionalTriggerBoard.cxx b/MUON/AliMUONRegionalTriggerBoard.cxx index 80cdb7b4e55..42f9fe5c8a2 100644 --- a/MUON/AliMUONRegionalTriggerBoard.cxx +++ b/MUON/AliMUONRegionalTriggerBoard.cxx @@ -103,7 +103,7 @@ void AliMUONRegionalTriggerBoard::Response() } //___________________________________________ -UShort_t AliMUONRegionalTriggerBoard::Algo(UShort_t i, UShort_t j, char *thres, Int_t level) +UShort_t AliMUONRegionalTriggerBoard::Algo(UShort_t i, UShort_t j, const char *thres, Int_t level) { /// implementation of the regional algorithm /// similar to the global algorithm except for the diff --git a/MUON/AliMUONRegionalTriggerBoard.h b/MUON/AliMUONRegionalTriggerBoard.h index 67761cc7de3..30ca7f54f09 100644 --- a/MUON/AliMUONRegionalTriggerBoard.h +++ b/MUON/AliMUONRegionalTriggerBoard.h @@ -34,7 +34,7 @@ class AliMUONRegionalTriggerBoard : public AliMUONTriggerBoard virtual void SetLocalResponse(UShort_t val[16]) {for (Int_t i=0;i<16;i++) fLocalResponse[i] = val[i];} /// response of the algorithm - virtual UShort_t Algo(UShort_t i, UShort_t j, char *thres, Int_t level); + virtual UShort_t Algo(UShort_t i, UShort_t j, const char *thres, Int_t level); /// set local boards enable void Mask(UShort_t mask); diff --git a/MUON/AliMUONSurveyObj.cxx b/MUON/AliMUONSurveyObj.cxx index b6832ecf466..6c783d3226e 100644 --- a/MUON/AliMUONSurveyObj.cxx +++ b/MUON/AliMUONSurveyObj.cxx @@ -579,7 +579,7 @@ Int_t AliMUONSurveyObj::SurveyToAlign(Double_t psi, Double_t tht, Double_t epsi, } -Double_t AliMUONSurveyObj::EvalFunction(TF2 *lFunction, Int_t iP1, Int_t iP2, Char_t *lCoord) { +Double_t AliMUONSurveyObj::EvalFunction(TF2 *lFunction, Int_t iP1, Int_t iP2, const Char_t *lCoord) { if (!lFunction) { AliError("No function given!!!"); @@ -755,7 +755,7 @@ Int_t AliMUONSurveyObj::CalculateBestTransf(Int_t iP1, Int_t iP2, Double_t *lXYZ AliMUONSurveyUtil *surveyUtil = AliMUONSurveyUtil::Instance(); // Xcenter functions - char *fxcName = "fXcn00"; + const char *fxcName = "fXcn00"; TF2 **fXc = new TF2*[2]; fxcName = "fXcn"; fXc[0] = new TF2(fxcName,surveyUtil,&AliMUONSurveyUtil::xnCenter,fXMin,fXMax,fYMin,fYMax,7,"AliMUONSurveyUtil","xnCenter"); @@ -763,7 +763,7 @@ Int_t AliMUONSurveyObj::CalculateBestTransf(Int_t iP1, Int_t iP2, Double_t *lXYZ fXc[1] = new TF2(fxcName,surveyUtil,&AliMUONSurveyUtil::xpCenter,fXMin,fXMax,fYMin,fYMax,7,"AliMUONSurveyUtil","xpCenter"); // Ycenter functions - char *fycName = "fYcn00"; + const char *fycName = "fYcn00"; TF2 **fYc = new TF2*[2]; fycName = "fYcn"; fYc[0] = new TF2(fycName,surveyUtil,&AliMUONSurveyUtil::ynCenter,fYMin,fYMax,fYMin,fYMax,8,"AliMUONSurveyUtil","ynCenter"); @@ -771,7 +771,7 @@ Int_t AliMUONSurveyObj::CalculateBestTransf(Int_t iP1, Int_t iP2, Double_t *lXYZ fYc[1] = new TF2(fycName,surveyUtil,&AliMUONSurveyUtil::ypCenter,fYMin,fYMax,fYMin,fYMax,8,"AliMUONSurveyUtil","ypCenter"); // Zcenter functions - char *fzcName = "fZcn00"; + const char *fzcName = "fZcn00"; TF2 **fZc = new TF2*[2]; fzcName = "fZcn"; fZc[0] = new TF2(fzcName,surveyUtil,&AliMUONSurveyUtil::znCenter,fZMin,fZMax,fZMin,fZMax,8,"AliMUONSurveyUtil","znCenter"); @@ -779,7 +779,7 @@ Int_t AliMUONSurveyObj::CalculateBestTransf(Int_t iP1, Int_t iP2, Double_t *lXYZ fZc[1] = new TF2(fzcName,surveyUtil,&AliMUONSurveyUtil::zpCenter,fZMin,fZMax,fZMin,fZMax,8,"AliMUONSurveyUtil","zpCenter"); // Phi rotation using xglobal coords functions - char *fphixName = "fPhiXnn00"; + const char *fphixName = "fPhiXnn00"; TF2 ***fPhiX = new TF2**[2]; for (Int_t iX =0; iX<2; iX++) { fPhiX[iX] = new TF2*[2]; @@ -794,7 +794,7 @@ Int_t AliMUONSurveyObj::CalculateBestTransf(Int_t iP1, Int_t iP2, Double_t *lXYZ fPhiX[1][1] = new TF2(fphixName,surveyUtil,&AliMUONSurveyUtil::phixpp,fXMin,fXMax,fXMin,fXMax,7,"AliMUONSurveyUtil","phixpp"); // Phi rotation using yglobal coords functions - char *fphiyName = "fPhiYnn00"; + const char *fphiyName = "fPhiYnn00"; TF2 ***fPhiY = new TF2**[2]; for (Int_t iY =0; iY<2; iY++) { fPhiY[iY] = new TF2*[2]; diff --git a/MUON/AliMUONSurveyObj.h b/MUON/AliMUONSurveyObj.h index 993cd7e9f9e..3aecc4cebcb 100644 --- a/MUON/AliMUONSurveyObj.h +++ b/MUON/AliMUONSurveyObj.h @@ -75,7 +75,7 @@ class AliMUONSurveyObj:public TObject Int_t SurveyToAlign(Double_t psi=0., Double_t tht=0., Double_t epsi=0., Double_t etht=0.); Double_t SurveyChi2(Double_t *par); - Double_t EvalFunction(TF2 *lFunction, Int_t iP1, Int_t iP2, Char_t *lCoord); + Double_t EvalFunction(TF2 *lFunction, Int_t iP1, Int_t iP2, const Char_t *lCoord); void CalculateTranslation(TF2 *xFunc, TF2 *yFunc, TF2 *zFunc, Int_t iP1, Int_t iP2, Double_t *lCenTemp); // TGeoCombiTrans *CalculateTransformation(TF2 *xFunc, TF2 *yFunc, TF2 *zFunc, TF2 *pFunc, Int_t iP1, Int_t iP2); diff --git a/Makefile b/Makefile index ca9dd2e4bea..65ab0a6352e 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ ALIROOTMODULES := STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \ THijing THbtp EMCAL HBTAN \ THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS \ JETAN HLT LHC ESDCheck STAT TTherminator CORRFW DPMJET TDPMjet \ - PWG0 PWG1 PWG2 PWG3 PWG4 + PWG0 PWG1 PWG2 PWG3 PWG4 UNICOR ifneq ($(shell $(ROOTCONFIG) --has-pythia8), no) ALIROOTMODULES += PYTHIA8 diff --git a/PWG0/AliCorrection.h b/PWG0/AliCorrection.h index c1d8e1fe7f0..ca038f614b6 100644 --- a/PWG0/AliCorrection.h +++ b/PWG0/AliCorrection.h @@ -32,8 +32,8 @@ public: virtual Long64_t Merge(TCollection* list); - AliCorrectionMatrix2D* GetEventCorrection() { return fEventCorr; } - AliCorrectionMatrix3D* GetTrackCorrection() { return fTrackCorr; } + AliCorrectionMatrix2D* GetEventCorrection() const { return fEventCorr; } + AliCorrectionMatrix3D* GetTrackCorrection() const { return fTrackCorr; } void SetEventCorrection(AliCorrectionMatrix2D* corr) { fEventCorr = corr; } void SetTrackCorrection(AliCorrectionMatrix3D* corr) { fTrackCorr = corr; } diff --git a/PWG0/AliCorrectionMatrix2D.cxx b/PWG0/AliCorrectionMatrix2D.cxx index 6878e719ca8..48d5ef5b9bc 100644 --- a/PWG0/AliCorrectionMatrix2D.cxx +++ b/PWG0/AliCorrectionMatrix2D.cxx @@ -114,7 +114,7 @@ TH2* AliCorrectionMatrix2D::GetMeasuredHistogram() const } //____________________________________________________________________ -TH1* AliCorrectionMatrix2D::Get1DCorrectionHistogram(Char_t* opt, Float_t min, Float_t max) +TH1* AliCorrectionMatrix2D::Get1DCorrectionHistogram(const Char_t* opt, Float_t min, Float_t max) { // // integrate the correction over one variable diff --git a/PWG0/AliCorrectionMatrix2D.h b/PWG0/AliCorrectionMatrix2D.h index 8a30353fe79..63264695d86 100644 --- a/PWG0/AliCorrectionMatrix2D.h +++ b/PWG0/AliCorrectionMatrix2D.h @@ -36,8 +36,8 @@ public: TH2* GetCorrectionHistogram() {return (TH2*)fhCorr;} - TH1* Get1DCorrection(Char_t* opt="x", Float_t min=0, Float_t max=0) {return Get1DCorrectionHistogram(opt,min,max);} - TH1* Get1DCorrectionHistogram(Char_t* opt="x", Float_t min=0, Float_t max=0); + TH1* Get1DCorrection(const Char_t* opt="x", Float_t min=0, Float_t max=0) {return Get1DCorrectionHistogram(opt,min,max);} + TH1* Get1DCorrectionHistogram(const Char_t* opt="x", Float_t min=0, Float_t max=0); void Rebin(Int_t x = 1, Int_t y = 1); diff --git a/PWG0/AliCorrectionMatrix3D.cxx b/PWG0/AliCorrectionMatrix3D.cxx index 3e37f0835b3..f025b9252c6 100644 --- a/PWG0/AliCorrectionMatrix3D.cxx +++ b/PWG0/AliCorrectionMatrix3D.cxx @@ -183,7 +183,7 @@ TH3* AliCorrectionMatrix3D::GetCorrectionHistogram() } //____________________________________________________________________ -AliCorrectionMatrix2D* AliCorrectionMatrix3D::Get2DCorrection(Char_t* opt, Float_t aMin, Float_t aMax) +AliCorrectionMatrix2D* AliCorrectionMatrix3D::Get2DCorrection(Option_t* opt, Float_t aMin, Float_t aMax) { // returns a 2D projection of this correction @@ -250,7 +250,7 @@ AliCorrectionMatrix2D* AliCorrectionMatrix3D::Get2DCorrection(Char_t* opt, Float } //____________________________________________________________________ -TH1* AliCorrectionMatrix3D::Get1DCorrectionHistogram(Char_t* opt, Float_t aMin1, Float_t aMax1, Float_t aMin2, Float_t aMax2) +TH1* AliCorrectionMatrix3D::Get1DCorrectionHistogram(Option_t* opt, Float_t aMin1, Float_t aMax1, Float_t aMin2, Float_t aMax2) { // returns a 1D projection of this correction AliDebug(AliLog::kWarning, Form("WARNING: test")); diff --git a/PWG0/AliCorrectionMatrix3D.h b/PWG0/AliCorrectionMatrix3D.h index 5101d4f33cf..ec651760f5d 100644 --- a/PWG0/AliCorrectionMatrix3D.h +++ b/PWG0/AliCorrectionMatrix3D.h @@ -46,9 +46,9 @@ public: TH3* GetMeasuredHistogram(); TH3* GetCorrectionHistogram(); - AliCorrectionMatrix2D* Get2DCorrection(Char_t* opt, Float_t aMin, Float_t aMax); - TH2* Get2DCorrectionHistogram(Char_t* opt, Float_t aMin, Float_t aMax) {return Get2DCorrection(opt,aMin,aMax)->GetCorrectionHistogram();} - TH1* Get1DCorrectionHistogram(Char_t* opt, Float_t aMins1=0, Float_t aMax1=0, Float_t aMins2=0, Float_t aMax2=0); + AliCorrectionMatrix2D* Get2DCorrection(Option_t* opt, Float_t aMin, Float_t aMax); + TH2* Get2DCorrectionHistogram(Option_t* opt, Float_t aMin, Float_t aMax) {return Get2DCorrection(opt,aMin,aMax)->GetCorrectionHistogram();} + TH1* Get1DCorrectionHistogram(Option_t* opt, Float_t aMins1=0, Float_t aMax1=0, Float_t aMins2=0, Float_t aMax2=0); void FillMeas(Float_t ax, Float_t ay, Float_t az); void FillGene(Float_t ax, Float_t ay, Float_t az); diff --git a/PWG0/AliPWG0Helper.cxx b/PWG0/AliPWG0Helper.cxx index 160a9466ebd..35b3683613a 100644 --- a/PWG0/AliPWG0Helper.cxx +++ b/PWG0/AliPWG0Helper.cxx @@ -79,7 +79,7 @@ Bool_t AliPWG0Helper::IsEventTriggered(ULong64_t triggerMask, Trigger trigger) } //____________________________________________________________________ -const Bool_t AliPWG0Helper::TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug) +Bool_t AliPWG0Helper::TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug) { // Checks if a vertex meets the needed quality criteria diff --git a/PWG0/AliPWG0Helper.h b/PWG0/AliPWG0Helper.h index 022b2339e52..d3aaf39531f 100644 --- a/PWG0/AliPWG0Helper.h +++ b/PWG0/AliPWG0Helper.h @@ -30,7 +30,7 @@ class AliPWG0Helper : public TObject static Bool_t IsEventTriggered(const AliESD* aEsd, Trigger trigger = kMB2); static Bool_t IsEventTriggered(ULong64_t triggerMask, Trigger trigger = kMB2); static const AliESDVertex* GetVertex(AliESDEvent* aEsd, AnalysisMode analysisMethod, Bool_t debug = kFALSE,Bool_t bRedoTPC = false); - static const Bool_t TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug = kFALSE); + static Bool_t TestVertex(const AliESDVertex* vertex, AnalysisMode analysisMode, Bool_t debug = kFALSE); static Bool_t IsPrimaryCharged(TParticle* aParticle, Int_t aTotalPrimaries, Bool_t adebug = kFALSE); diff --git a/PWG0/TPC/AliTPCClusterHistograms.cxx b/PWG0/TPC/AliTPCClusterHistograms.cxx index 4d5d5c9439e..fafa6a7fadf 100644 --- a/PWG0/TPC/AliTPCClusterHistograms.cxx +++ b/PWG0/TPC/AliTPCClusterHistograms.cxx @@ -685,7 +685,7 @@ void AliTPCClusterHistograms::FillCluster(AliTPCclusterMI* cluster, Int_t time) fhSigmaYProfileZVsRow ->Fill(padRow, z, sigmaY); fhSigmaZProfileZVsRow ->Fill(padRow, z, sigmaZ); - if (time>0 & fTimeStart>0 & fTimeStop>0 & time>fTimeStart) { + if (time>0 && fTimeStart>0 && fTimeStop>0 && time>fTimeStart) { //Float_t timeFraction = (time - fTimeStart)/(fTimeStop-fTimeStart); fhMeanQtotVsTime->Fill(time,qTot); diff --git a/PWG0/dNdEta/dNdEtaAnalysis.cxx b/PWG0/dNdEta/dNdEtaAnalysis.cxx index 42fd1fce799..ac518130925 100644 --- a/PWG0/dNdEta/dNdEtaAnalysis.cxx +++ b/PWG0/dNdEta/dNdEtaAnalysis.cxx @@ -43,7 +43,7 @@ dNdEtaAnalysis::dNdEtaAnalysis() : } //____________________________________________________________________ -dNdEtaAnalysis::dNdEtaAnalysis(Char_t* name, Char_t* title, AliPWG0Helper::AnalysisMode analysisMode) : +dNdEtaAnalysis::dNdEtaAnalysis(const Char_t* name, const Char_t* title, AliPWG0Helper::AnalysisMode analysisMode) : TNamed(name, title), fData(0), fMult(0), diff --git a/PWG0/dNdEta/dNdEtaAnalysis.h b/PWG0/dNdEta/dNdEtaAnalysis.h index 38475da8d11..a82f3d025ed 100644 --- a/PWG0/dNdEta/dNdEtaAnalysis.h +++ b/PWG0/dNdEta/dNdEtaAnalysis.h @@ -33,7 +33,7 @@ public: enum { kVertexBinning = 1+2 }; // the first is for the whole vertex range, the others divide the vertex range dNdEtaAnalysis(); - dNdEtaAnalysis(Char_t* name, Char_t* title, AliPWG0Helper::AnalysisMode analysisMode = AliPWG0Helper::kSPD); + dNdEtaAnalysis(const Char_t* name, const Char_t* title, AliPWG0Helper::AnalysisMode analysisMode = AliPWG0Helper::kSPD); virtual ~dNdEtaAnalysis(); dNdEtaAnalysis(const dNdEtaAnalysis &c); @@ -52,12 +52,12 @@ public: virtual Long64_t Merge(TCollection* list); - AliCorrection* GetData() { return fData; } + AliCorrection* GetData() const { return fData; } - TH1F* GetPtHistogram() { return fPtDist; } + TH1F* GetPtHistogram() const { return fPtDist; } - TH1F* GetdNdEtaHistogram(Int_t i = 0) { return fdNdEta[i]; } - TH1F* GetdNdEtaPtCutOffCorrectedHistogram(Int_t i = 0) { return fdNdEtaPtCutOffCorrected[i]; } + TH1F* GetdNdEtaHistogram(Int_t i = 0) const { return fdNdEta[i]; } + TH1F* GetdNdEtaPtCutOffCorrectedHistogram(Int_t i = 0) const { return fdNdEtaPtCutOffCorrected[i]; } void SetAnalysisMode(AliPWG0Helper::AnalysisMode mode) { fAnalysisMode = mode; } diff --git a/PWG0/highMultiplicity/AliHighMultiplicitySelector.cxx b/PWG0/highMultiplicity/AliHighMultiplicitySelector.cxx index c9f278511fe..d0245b612b9 100644 --- a/PWG0/highMultiplicity/AliHighMultiplicitySelector.cxx +++ b/PWG0/highMultiplicity/AliHighMultiplicitySelector.cxx @@ -198,7 +198,7 @@ Bool_t AliHighMultiplicitySelector::Process(Long64_t entry) TClonesArray* digits = 0; treeD->SetBranchAddress("ITSDigitsSPD", &digits); - if (digits); + if (digits) digits->Clear(); // each value for both layers diff --git a/PWG2/FLOW/AliCumulantsFunctions.cxx b/PWG2/FLOW/AliCumulantsFunctions.cxx index 03f3c4d8dde..8b6b19962a2 100644 --- a/PWG2/FLOW/AliCumulantsFunctions.cxx +++ b/PWG2/FLOW/AliCumulantsFunctions.cxx @@ -353,8 +353,8 @@ void AliCumulantsFunctions::Calculate() ///////////////////////DIFFERENTIAL FLOW CALCULATIONS//////////////////////// ///////////////////////////////////////////////////////////////////////////// - Double_t X[fgknBins][fgkPmax][fgkQmax]={{0.}}; - Double_t Y[fgknBins][fgkPmax][fgkQmax]={{0.}}; + Double_t X[fgknBins][fgkPmax][fgkQmax]={{{0.}}}; + Double_t Y[fgknBins][fgkPmax][fgkQmax]={{{0.}}}; /* //3D profiles diff --git a/PWG3/base/AliQuarkoniaEfficiency.cxx b/PWG3/base/AliQuarkoniaEfficiency.cxx index 89a6ff5079c..2a140652900 100644 --- a/PWG3/base/AliQuarkoniaEfficiency.cxx +++ b/PWG3/base/AliQuarkoniaEfficiency.cxx @@ -93,7 +93,7 @@ void AliQuarkoniaEfficiency::Init() break; } - char *param=0; + const char *param=0; switch (fParameterization){ case kFlat: param = "Flat"; @@ -106,7 +106,7 @@ void AliQuarkoniaEfficiency::Init() break; } - char *trig=0; + const char *trig=0; switch (fTriggerType){ case kSinglePlusLpt: trig = "SinglePlusLpt"; diff --git a/PWG3/muon/AliAODEventInfo.cxx b/PWG3/muon/AliAODEventInfo.cxx index 9ce2102c3d6..5d5283e7f88 100644 --- a/PWG3/muon/AliAODEventInfo.cxx +++ b/PWG3/muon/AliAODEventInfo.cxx @@ -34,7 +34,7 @@ AliAODEventInfo::~AliAODEventInfo() } //______________________________________________________________________________ -Bool_t AliAODEventInfo::IsHeaderAccessible(Char_t *msg) const { +Bool_t AliAODEventInfo::IsHeaderAccessible(const Char_t *msg) const { // Tests if the header pointer is set if(fHe!=0){ return 1; diff --git a/PWG3/muon/AliAODEventInfo.h b/PWG3/muon/AliAODEventInfo.h index 7ac7688e504..c20bc72b993 100644 --- a/PWG3/muon/AliAODEventInfo.h +++ b/PWG3/muon/AliAODEventInfo.h @@ -71,7 +71,7 @@ public: // AliAODHeader *GetHe() { return (fHe!=0) ? (AliAODHeader*)fHe.GetObject() : 0; } // AliAODTrack *GetTr(); - Bool_t IsHeaderAccessible(Char_t *msg=0) const; + Bool_t IsHeaderAccessible(const Char_t *msg=0) const; protected: // Missing in AliAODHeader and added here diff --git a/PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx b/PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx index 981af239bb8..62ab9fcd728 100644 --- a/PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx +++ b/PWG3/muon/AliAnalysisTaskESDMuonFilter.cxx @@ -83,7 +83,7 @@ void AliAnalysisTaskESDMuonFilter::ConvertESDtoAOD() Double_t pid[10]; // has to be changed once the muon pid is provided by the ESD - for (Int_t i = 0; i < 10; pid[i++] = 0.); + for (Int_t i = 0; i < 10; pid[i++] = 0.) {} pid[AliAODTrack::kMuon]=1.; AliAODHeader* header = AODEvent()->GetHeader(); diff --git a/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx index 95d8c407030..637d8f7e02f 100644 --- a/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx +++ b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx @@ -91,7 +91,7 @@ void AliAnalysisTaskMuonAODfromGeneral::Exec(Option_t *) { Int_t nTracks=fOrgAOD->GetNumberOfTracks(); Int_t nMuTracks=0; Int_t nPosTracks = 0; - Int_t mutrNumb[10]; for (Int_t i=0; i<10; mutrNumb[i++]=0); + Int_t mutrNumb[10]; for (Int_t i=0; i<10; mutrNumb[i++]=0) {} for (Int_t iTrack=0; iTrackGetTrack(iTrack)->PID(); if (trackpid[AliAODTrack::kMuon]==1.) { diff --git a/PWG3/muon/AliAnalysisTaskSingleMu.cxx b/PWG3/muon/AliAnalysisTaskSingleMu.cxx index 4a28358e4e0..02627354afc 100644 --- a/PWG3/muon/AliAnalysisTaskSingleMu.cxx +++ b/PWG3/muon/AliAnalysisTaskSingleMu.cxx @@ -100,11 +100,11 @@ void AliAnalysisTaskSingleMu::CreateOutputObjects() Int_t ptBins = 60; Float_t ptLow = 0., ptHigh = 30.; - Char_t *ptName = "P_{t} (GeV/c)"; + const Char_t *ptName = "P_{t} (GeV/c)"; Int_t vzBins = 40; Float_t vzLow = -20., vzHigh = 20.; - Char_t *vzName = "Vz (cm)"; + const Char_t *vzName = "Vz (cm)"; TString baseName, histoName; fOutputContainer = new TObjArray(fgkNhistos*fgkNTrigCuts); diff --git a/PWG3/muon/AliAnalysisTaskTrigChEff.cxx b/PWG3/muon/AliAnalysisTaskTrigChEff.cxx index 70d6c9306f1..4862d365223 100644 --- a/PWG3/muon/AliAnalysisTaskTrigChEff.cxx +++ b/PWG3/muon/AliAnalysisTaskTrigChEff.cxx @@ -92,22 +92,22 @@ void AliAnalysisTaskTrigChEff::CreateOutputObjects() { TString cathCode[2] = {"bendPlane", "nonBendPlane"}; TString countTypeName[2] = {"CountInCh", "NonCountInCh"}; - Char_t* yAxisTitle = "counts"; + const Char_t* yAxisTitle = "counts"; const Int_t kNboards = 234; //AliMpConstants::NofLocalBoards(); const Int_t kFirstTrigCh = 11;//AliMpConstants::NofTrackingChambers()+1; Int_t chamberBins = kNchambers; Float_t chamberLow = kFirstTrigCh-0.5, chamberHigh = kFirstTrigCh+kNchambers-0.5; - Char_t* chamberName = "chamber"; + const Char_t* chamberName = "chamber"; Int_t slatBins = kNslats; Float_t slatLow = 0-0.5, slatHigh = kNslats-0.5; - Char_t* slatName = "slat"; + const Char_t* slatName = "slat"; Int_t boardBins = kNboards; Float_t boardLow = 1-0.5, boardHigh = kNboards+1.-0.5; - Char_t* boardName = "board"; + const Char_t* boardName = "board"; TString baseName, histoName; fList = new TList(); diff --git a/PWG3/muondep/AliCheckMuonDetEltResponse.cxx b/PWG3/muondep/AliCheckMuonDetEltResponse.cxx index ef1b63b96cb..a9c8de49301 100644 --- a/PWG3/muondep/AliCheckMuonDetEltResponse.cxx +++ b/PWG3/muondep/AliCheckMuonDetEltResponse.cxx @@ -323,7 +323,7 @@ void AliCheckMuonDetEltResponse::TrackParamLoop() Int_t nbrOfMissCh = newChamber - (oldChamber+1); //!3 & chamber<6) iDet = detElt-fOffset*(chamber+1)+18*(chamber-4)+16; + if (chamber>3 && chamber<6) iDet = detElt-fOffset*(chamber+1)+18*(chamber-4)+16; if (chamber>5) iDet = detElt-fOffset*(chamber+1)+26*(chamber-6)+52; return iDet; @@ -487,9 +487,9 @@ void AliCheckMuonDetEltResponse::GetDetEltFromPosition(Int_t chamber, else //!0 & posY>0) fGetDetElt[0] = fOffset*(chamber+1) ; - if(posX<0 & posY>0) fGetDetElt[0] = fOffset*(chamber+1) + 1; - if(posX<0 & posY<0) fGetDetElt[0] = fOffset*(chamber+1) + 2; - if(posX>0 & posY<0) fGetDetElt[0] = fOffset*(chamber+1) + 3; + if(posX>0 && posY>0) fGetDetElt[0] = fOffset*(chamber+1) ; + if(posX<0 && posY>0) fGetDetElt[0] = fOffset*(chamber+1) + 1; + if(posX<0 && posY<0) fGetDetElt[0] = fOffset*(chamber+1) + 2; + if(posX>0 && posY<0) fGetDetElt[0] = fOffset*(chamber+1) + 3; } } diff --git a/PWG3/vertexingHF/AliAnalysisVertexingHF.cxx b/PWG3/vertexingHF/AliAnalysisVertexingHF.cxx index 64e8a819ad9..02a58203af6 100644 --- a/PWG3/vertexingHF/AliAnalysisVertexingHF.cxx +++ b/PWG3/vertexingHF/AliAnalysisVertexingHF.cxx @@ -1157,7 +1157,7 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event, vprimary->GetCovarianceMatrix(cov); Double_t chi2toNDF = vprimary->GetChi2perNDF(); Int_t ncontr=nindices; - if(vprimary->GetTitle()=="VertexerTracksWithContraint") ncontr += 1; + if(!strcmp(vprimary->GetTitle(),"VertexerTracksWithContraint")) ncontr += 1; Double_t chi2=chi2toNDF*(2.*(Double_t)ncontr-3.); fV1 = new AliESDVertex(pos,cov,chi2,ncontr,vprimary->GetName()); fV1->SetTitle(vprimary->GetTitle()); diff --git a/PWG4/PartCorr/AliAnalysisTaskPHOSExample.cxx b/PWG4/PartCorr/AliAnalysisTaskPHOSExample.cxx index f44fb1cad0b..06ece507ab8 100644 --- a/PWG4/PartCorr/AliAnalysisTaskPHOSExample.cxx +++ b/PWG4/PartCorr/AliAnalysisTaskPHOSExample.cxx @@ -304,7 +304,7 @@ void AliAnalysisTaskPHOSExample::Terminate(Option_t *) AliInfo(Form("!!! All the eps files are in %s.tar.gz !!!", GetName())) ; - char * report ; + const char * report ; if(problem) report="Problems found, please check!!!"; else diff --git a/STEER/AliESDInputHandlerRP.h b/STEER/AliESDInputHandlerRP.h index 275357a7283..877f4603cbd 100644 --- a/STEER/AliESDInputHandlerRP.h +++ b/STEER/AliESDInputHandlerRP.h @@ -49,7 +49,7 @@ class AliESDInputHandlerRP : public AliESDInputHandler { Int_t fNEvent; //! Number of events in current directory Int_t fFileNumber; //! Input file number Int_t fEventsPerFile; //! Number of events per file - char *fExtension; //! File name extension + const Char_t *fExtension; //! File name extension TString *fPathName; //! Input file path Bool_t fIsArchive; //! True if directory is an archive ClassDef(AliESDInputHandlerRP, 1); diff --git a/STEER/AliGlobalQADataMaker.cxx b/STEER/AliGlobalQADataMaker.cxx index dfe17c3f68f..0b5f25350c1 100644 --- a/STEER/AliGlobalQADataMaker.cxx +++ b/STEER/AliGlobalQADataMaker.cxx @@ -37,7 +37,7 @@ void AliGlobalQADataMaker::InitRecPoints() { // This function books the histograms of *track*residuals* // as a part of global QA //------------------------------------------------------ - Char_t *name[]={ + const Char_t *name[]={ "SPD1 residuals Y","SPD1 residuals Z", "SPD2 residuals Y","SPD2 residuals Z", "SDD1 residuals Y","SDD1 residuals Z", @@ -112,7 +112,7 @@ void AliGlobalQADataMaker::InitESDs() { //------------------------------------------------------ {// Cluster related QA - Char_t *name[]={ + const Char_t *name[]={ "Fraction of the assigned clusters in ITS", "Fraction of the assigned clusters in TPC", "Fraction of the assigned clusters in TRD" @@ -123,7 +123,7 @@ void AliGlobalQADataMaker::InitESDs() { } {// Track related QA - Char_t *name[]={ + const Char_t *name[]={ "Track azimuthal distribution (rad)", // kTrk0 "Track pseudo-rapidity distribution", // kTrk1 "TPC: track momentum distribution (GeV)", // kTrk2 @@ -142,7 +142,7 @@ void AliGlobalQADataMaker::InitESDs() { } {// V0 related QA - Char_t *name[]={ + const Char_t *name[]={ "K0s mass (GeV)", "Lambda0 + Lambda0Bar mass (GeV)" }; @@ -151,7 +151,7 @@ void AliGlobalQADataMaker::InitESDs() { } {// PID related QA - Char_t *name[]={ + const Char_t *name[]={ "ITS: dEdx (ADC) for particles with momentum 0.4 - 0.5 (GeV)", "TPC: dEdx (ADC) for particles with momentum 0.4 - 0.5 (GeV)", "TOF: tracking - measured (ps)" diff --git a/STEER/AliMCEventHandler.h b/STEER/AliMCEventHandler.h index 901eec841ec..fa5aebb7194 100644 --- a/STEER/AliMCEventHandler.h +++ b/STEER/AliMCEventHandler.h @@ -86,7 +86,7 @@ private: Int_t fNEvent; //! Number of events Int_t fEvent; //! Current event TString *fPathName; //! Input file path - char *fExtension; //! File name extension + const Char_t *fExtension; //! File name extension Int_t fFileNumber; //! Input file number Int_t fEventsPerFile; //! Number of events per file Bool_t fReadTR; // determines if TR shall be read diff --git a/STEER/AliQADataMakerSteer.cxx b/STEER/AliQADataMakerSteer.cxx index a9e9dfe50d2..9d87c939874 100644 --- a/STEER/AliQADataMakerSteer.cxx +++ b/STEER/AliQADataMakerSteer.cxx @@ -62,7 +62,7 @@ ClassImp(AliQADataMakerSteer) //_____________________________________________________________________________ -AliQADataMakerSteer::AliQADataMakerSteer(char * mode, const char* gAliceFilename, const char * name, const char * title) : +AliQADataMakerSteer::AliQADataMakerSteer(const Char_t * mode, const Char_t* gAliceFilename, const Char_t * name, const Char_t * title) : TNamed(name, title), fCurrentEvent(0), fCycleSame(kFALSE), diff --git a/STEER/AliQADataMakerSteer.h b/STEER/AliQADataMakerSteer.h index 46509439e23..d0f37b66112 100644 --- a/STEER/AliQADataMakerSteer.h +++ b/STEER/AliQADataMakerSteer.h @@ -34,9 +34,9 @@ class AliCorrQADataMakerRec ; class AliQADataMakerSteer: public TNamed { public: - AliQADataMakerSteer(char * mode, const char* gAliceFilename = "galice.root", - const char * name = "AliQADataMakerSteer", - const char * title = "QA makers") ; + AliQADataMakerSteer(const Char_t * mode, const Char_t * gAliceFilename = "galice.root", + const Char_t * name = "AliQADataMakerSteer", + const Char_t * title = "QA makers") ; AliQADataMakerSteer(const AliQADataMakerSteer & qas) ; AliQADataMakerSteer & operator = (const AliQADataMakerSteer & qas) ; virtual ~AliQADataMakerSteer() ; @@ -89,7 +89,7 @@ private: TString fGAliceFileName ; //! name of the galice file UInt_t fFirstEvent ; //! first event to process Int_t fMaxEvents ; //! number of events to process - char * fMode ; //! sim or rec + const Char_t * fMode ; //! sim or rec Long64_t fNumberOfEvents ; //! number of events in the run AliRecoParam fRecoParam; //! container for the reco-param objects for detectors UInt_t fRunNumber ; //! current run number diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx index 5995677cfd1..eefacec4f6d 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -1736,12 +1736,14 @@ Bool_t AliSimulation::RunHLT() typedef void (*CompileInfo)( char*& date, char*& time); CompileInfo fctInfo=(CompileInfo)gSystem->DynFindSymbol(ALIHLTSIMULATION_LIBRARY, "CompileInfo"); if (fctInfo) { - char* date=""; - char* time=""; - (*fctInfo)(date, time); - if (!date) date="unknown"; - if (!time) time="unknown"; + Char_t* date=0; + Char_t* time=0; + (*fctInfo)(date,time); + if (!date) {date=new Char_t[8]; strcpy(date,"unknown");} + if (!time) {time=new Char_t[8]; strcpy(time,"unknown");} AliInfo(Form("%s build on %s (%s)", ALIHLTSIMULATION_LIBRARY, date, time)); + delete date; + delete time; } else { AliInfo(Form("no build info available for %s", ALIHLTSIMULATION_LIBRARY)); } diff --git a/STEER/AliSplineFit.cxx b/STEER/AliSplineFit.cxx index 244be85b6b4..7e60c7790a6 100644 --- a/STEER/AliSplineFit.cxx +++ b/STEER/AliSplineFit.cxx @@ -891,7 +891,7 @@ void AliSplineFit::MakeKnots0(TGraph * graph, Double_t maxdelta, Int_t minpoints -void AliSplineFit::MakeSmooth(TGraph * graph, Float_t ratio, char * type){ +void AliSplineFit::MakeSmooth(TGraph * graph, Float_t ratio, Option_t * type){ // // Interface to GraphSmooth // diff --git a/STEER/AliSplineFit.h b/STEER/AliSplineFit.h index cf8e6cbcf3a..5af185f6126 100644 --- a/STEER/AliSplineFit.h +++ b/STEER/AliSplineFit.h @@ -30,7 +30,7 @@ class AliSplineFit : public TObject { void MakeKnots0(TGraph * graph, Double_t maxdelta, Int_t minpoints); void SplineFit(Int_t nder); void CopyGraph(); - void MakeSmooth(TGraph * graph, Float_t ratio, char * type); + void MakeSmooth(TGraph * graph, Float_t ratio, Option_t * type); void Update(TSpline3 *spline, Int_t nknots); void Cleanup(); Int_t GetKnots() const {return fN;} diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx index b5a1114ade2..e3dec76dfbc 100644 --- a/STRUCT/AliFRAMEv2.cxx +++ b/STRUCT/AliFRAMEv2.cxx @@ -1355,7 +1355,7 @@ void AliFRAMEv2::StepManager() -void AliFRAMEv2::MakeHeatScreen(char* name, Float_t dyP, Int_t rot1, Int_t rot2) +void AliFRAMEv2::MakeHeatScreen(const char* name, Float_t dyP, Int_t rot1, Int_t rot2) { // Heat screen panel // @@ -1435,7 +1435,7 @@ void AliFRAMEv2::MakeHeatScreen(char* name, Float_t dyP, Int_t rot1, Int_t rot2) -void AliFRAMEv2::WebFrame(char* name, Float_t dHz, Float_t theta0, Float_t phi0) +void AliFRAMEv2::WebFrame(const char* name, Float_t dHz, Float_t theta0, Float_t phi0) { // // Create a web frame element diff --git a/STRUCT/AliFRAMEv2.h b/STRUCT/AliFRAMEv2.h index d65cb45dc8a..4505f6273e5 100644 --- a/STRUCT/AliFRAMEv2.h +++ b/STRUCT/AliFRAMEv2.h @@ -25,8 +25,8 @@ public: virtual Int_t IsVersion() const; virtual void SetHoles(Int_t flag=0) {fHoles = flag;} virtual Int_t Holes() const {return fHoles;} - virtual void MakeHeatScreen(char* name, Float_t dyP, Int_t rot1, Int_t rot2); - virtual void WebFrame(char* name, Float_t dHz, Float_t theta0, Float_t phi0); + virtual void MakeHeatScreen(const char* name, Float_t dyP, Int_t rot1, Int_t rot2); + virtual void WebFrame(const char* name, Float_t dHz, Float_t theta0, Float_t phi0); private: Int_t fHoles; // flag fHoles=0 => no holes, with holes otherwise diff --git a/STRUCT/AliPIPEv3.cxx b/STRUCT/AliPIPEv3.cxx index 8b9822d4ca8..3f4045a9faf 100644 --- a/STRUCT/AliPIPEv3.cxx +++ b/STRUCT/AliPIPEv3.cxx @@ -2902,7 +2902,7 @@ TGeoPcon* AliPIPEv3::MakeInsulationFromTemplate(TGeoPcon* shape) } -TGeoVolume* AliPIPEv3::MakeBellow(char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie) +TGeoVolume* AliPIPEv3::MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie) { // nc Number of convolution // rMin Inner radius of the bellow diff --git a/STRUCT/AliPIPEv3.h b/STRUCT/AliPIPEv3.h index 8ecdcdc97c0..72e5a65cd5d 100644 --- a/STRUCT/AliPIPEv3.h +++ b/STRUCT/AliPIPEv3.h @@ -33,7 +33,7 @@ class AliPIPEv3 : public AliPIPE { private: virtual TGeoPcon* MakeMotherFromTemplate(TGeoPcon* shape, Int_t imin = -1, Int_t imax = -1, Float_t r0 = 0., Int_t nz =-1); virtual TGeoPcon* MakeInsulationFromTemplate(TGeoPcon* shape); - virtual TGeoVolume* MakeBellow(char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie); + virtual TGeoVolume* MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie); protected: ClassDef(AliPIPEv3,1) //Class for PIPE version using TGeo }; diff --git a/THerwig/THerwig6.cxx b/THerwig/THerwig6.cxx index 8fc42c91dc0..4c0cfd69e31 100644 --- a/THerwig/THerwig6.cxx +++ b/THerwig/THerwig6.cxx @@ -530,7 +530,7 @@ void THerwig6::Hwuinc() hwuinc_(); } -void THerwig6::Hwusta(char* name) +void THerwig6::Hwusta(const char* name) { hwusta_(name,8); diff --git a/THerwig/THerwig6.h b/THerwig/THerwig6.h index f55dcd1e63f..9803cf9d9d0 100644 --- a/THerwig/THerwig6.h +++ b/THerwig/THerwig6.h @@ -699,7 +699,7 @@ typedef struct { extern "C" { void hwigin_(); void hwuinc_(); - void hwusta_(char * name, int); + void hwusta_(const char * name, int); void hweini_(); void hwuine_(); void hwepro_(); @@ -875,45 +875,45 @@ public: void SetZJMAX (double d) { fHwhard->ZJMAX = d; } // /HWPROP/ - Hwprop_t* GetHwprop () { return fHwprop; } + Hwprop_t* GetHwprop () const { return fHwprop; } double GetRMASS (int i) const { return fHwprop->RMASS[i]; } void SetRMASS (int i, double r) { fHwprop->RMASS[i] = r; } // /HWUNAM/ - Hwunam_t* GetHwunam () { return fHwunam; } + Hwunam_t* GetHwunam () const { return fHwunam; } void GetRNAME (int i, char a[9]) { for (int j=0;j<8;j++) a[j] = fHwunam->RNAME[i][j]; a[8] = '\0';} /* char* GetRNAME(int i) { return fHwunam->RNAME[i]; }*/ // /HWUPDT/ - Hwupdt_t* GetHwupdt () { return fHwupdt; } + Hwupdt_t* GetHwupdt () const { return fHwupdt; } // /HWUWTS/ - Hwuwts_t* GetHwuwts () { return fHwuwts; } + Hwuwts_t* GetHwuwts () const { return fHwuwts; } // /HWUCLU/ - Hwuclu_t* GetHwuclu () { return fHwuclu; } + Hwuclu_t* GetHwuclu () const { return fHwuclu; } // /HWDIST/ - Hwdist_t* GetHwdist () { return fHwdist; } + Hwdist_t* GetHwdist () const { return fHwdist; } // /HWQDKT/ - Hwqdks_t* GetHwqdkt () { return fHwqdks; } + Hwqdks_t* GetHwqdkt () const { return fHwqdks; } // /HWUSUD/ - Hwusud_t* GetHwusud () { return fHwusud; } + Hwusud_t* GetHwusud () const { return fHwusud; } // /HWSUSY/ - Hwsusy_t* GetHwsusy () { return fHwsusy; } + Hwsusy_t* GetHwsusy () const { return fHwsusy; } // /HWRPAR/ - Hwrpar_t* GetHwrpar () { return fHwrpar; } + Hwrpar_t* GetHwrpar () const { return fHwrpar; } // /HWMINB/ - Hwminb_t* GetHwminb () { return fHwminb; } + Hwminb_t* GetHwminb () const { return fHwminb; } // /HWCLUS/ - Hwclus_t* GetHwclus () { return fHwclus; } + Hwclus_t* GetHwclus () const { return fHwclus; } // Herwig6 routines // the user would call @@ -933,10 +933,10 @@ public: void CloseFortranFile(int lun); Int_t ImportParticles(TClonesArray *particles, Option_t *option=""); TObjArray *ImportParticles(Option_t *option=""); - TObjArray *Particles() { return fParticles; } + TObjArray *Particles() const { return fParticles; } void Hwigin(); void Hwuinc(); - void Hwusta(char * name); + void Hwusta(const char * name); void Hweini(); void Hwuine(); void Hwepro(); diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx index b0b519b62b1..b02d5451a8e 100644 --- a/TOF/AliTOFAlignment.cxx +++ b/TOF/AliTOFAlignment.cxx @@ -235,11 +235,11 @@ void AliTOFAlignment::Align( Float_t *tr, Float_t *rot) AliInfo(Form("Number of Alignable Volumes: %d",fNTOFAlignObj)); } //_____________________________________________________________________________ -void AliTOFAlignment::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFAlignment::WriteParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write Align Par on CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "AlignPar" ; + const Char_t *sel1 = "AlignPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId idTOFAlign(out,minrun,maxrun); @@ -249,11 +249,11 @@ void AliTOFAlignment::WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) man->Put(fTOFAlignObjArray,idTOFAlign,mdTOFAlign); } //_____________________________________________________________________________ -void AliTOFAlignment::ReadParFromCDB(Char_t *sel, Int_t nrun) +void AliTOFAlignment::ReadParFromCDB(const Char_t *sel, Int_t nrun) { //Read Align Par from CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "AlignPar" ; + const Char_t *sel1 = "AlignPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -267,11 +267,11 @@ void AliTOFAlignment::ReadParFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -void AliTOFAlignment::WriteSimParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFAlignment::WriteSimParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write Sim Align Par on CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "AlignSimPar" ; + const Char_t *sel1 = "AlignSimPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId idTOFAlign(out,minrun,maxrun); @@ -281,10 +281,10 @@ void AliTOFAlignment::WriteSimParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) man->Put(fTOFAlignObjArray,idTOFAlign,mdTOFAlign); } //_____________________________________________________________________________ -void AliTOFAlignment::ReadSimParFromCDB(Char_t *sel, Int_t nrun){ +void AliTOFAlignment::ReadSimParFromCDB(const Char_t *sel, Int_t nrun){ //Read Sim Align Par from CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "AlignSimPar" ; + const Char_t *sel1 = "AlignSimPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); diff --git a/TOF/AliTOFAlignment.h b/TOF/AliTOFAlignment.h index 3612418339f..6d5af51303b 100644 --- a/TOF/AliTOFAlignment.h +++ b/TOF/AliTOFAlignment.h @@ -33,10 +33,10 @@ class AliTOFAlignment :public TTask{ AliTOFAlignment(const AliTOFAlignment &t); //Copy Ctor AliTOFAlignment& operator=(const AliTOFAlignment &source); // Assignment Operator virtual ~AliTOFAlignment(); - virtual void WriteParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - virtual void ReadParFromCDB(Char_t *sel, Int_t nrun); - virtual void WriteSimParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - virtual void ReadSimParFromCDB(Char_t *sel, Int_t nrun); + virtual void WriteParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + virtual void ReadParFromCDB(const Char_t *sel, Int_t nrun); + virtual void WriteSimParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + virtual void ReadSimParFromCDB(const Char_t *sel, Int_t nrun); virtual void Smear(Float_t *tr=0, Float_t *rot=0); // create a set of AlignObj for TOF virtual void Align(Float_t *tr=0, Float_t *rot=0); // create a set of AlignObj for TOF TObjArray * GetTOFAlignArray() const {return fTOFAlignObjArray;} diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx index d9eeb7511a0..65c86f5b99f 100644 --- a/TOF/AliTOFcalib.cxx +++ b/TOF/AliTOFcalib.cxx @@ -290,13 +290,13 @@ void AliTOFcalib::CreateCalObjects(){ fStatus = new AliTOFChannelOnlineStatusArray(fNChannels); } //_____________________________________________________________________________ -void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteConfigMapOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Config" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Config" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF configuration map for online calib on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -311,11 +311,11 @@ void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) } //_____________________________________________________________________________ -void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel) +void AliTOFcalib::WriteConfigMapOnCDB(const Char_t *sel) { //Write calibration parameters to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Config" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Config" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -330,13 +330,13 @@ void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel) delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlineDelayOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters to the CDB -------> new calib objs!!!!! SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnlineDelay" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "ParOnlineDelay" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -350,13 +350,13 @@ void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel, Int_t minrun, Int_t maxr delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlineStatusOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters to the CDB -------> new calib objs!!!!! SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Status" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Status" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online status calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -371,11 +371,11 @@ void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel, Int_t minrun, Int_t max } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlineDelayOnCDB(const Char_t *sel) { //Write calibration parameters to the CDB with infinite validity -------> new calib objs!!!!! AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnlineDelay" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "ParOnlineDelay" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -391,11 +391,11 @@ void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlineStatusOnCDB(const Char_t *sel) { //Write calibration parameters to the CDB with infinite validity -------> new calib objs!!!!! AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Status" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Status" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -410,13 +410,13 @@ void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel) delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlineOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnline" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "ParOnline" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -430,13 +430,13 @@ void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlinePulserOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters from pulser to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Pulser" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Pulser" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online calib obj from pulser on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -450,13 +450,13 @@ void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel, Int_t minrun, Int_t max delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlineNoiseOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters from noise to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Noise" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Noise" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online calib obj from noise on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -470,13 +470,13 @@ void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel, Int_t minrun, Int_t maxr delete md; } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOnlineHWOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun) { //Write calibration parameters from hardware to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "HW" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "HW" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF online calib obj from hardware on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -491,11 +491,11 @@ void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlineOnCDB(const Char_t *sel) { //Write calibration parameters to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnline" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "ParOnline" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -511,11 +511,11 @@ void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlinePulserOnCDB(const Char_t *sel) { //Write calibration parameters from pulser to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Pulser" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Pulser" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -531,11 +531,11 @@ void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlineNoiseOnCDB(const Char_t *sel) { //Write calibration parameters from noise to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Noise" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "Noise" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -551,11 +551,11 @@ void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel) +void AliTOFcalib::WriteParOnlineHWOnCDB(const Char_t *sel) { //Write calibration parameters from hardware to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "HW" ; // to be consistent with TOFPreprocessor + const Char_t *sel1 = "HW" ; // to be consistent with TOFPreprocessor Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -571,13 +571,13 @@ void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel) } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun) +void AliTOFcalib::WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun) { //Write calibration parameters to the CDB SetFirstRun(minrun); SetLastRun(maxrun); AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOffline" ; + const Char_t *sel1 = "ParOffline" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliDebug(2,Form("Writing TOF offline calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun)); @@ -590,11 +590,11 @@ void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity, Int_ } //_____________________________________________________________________________ -void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity) +void AliTOFcalib::WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity) { //Write calibration parameters to the CDB with infinite validity AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOffline" ; + const Char_t *sel1 = "ParOffline" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBRunRange runrange(fFirstRun,fLastRun); @@ -608,11 +608,11 @@ void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadConfigMapFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadConfigMapFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Config" ; + const Char_t *sel1 = "Config" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -632,11 +632,11 @@ Bool_t AliTOFcalib::ReadConfigMapFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from the CDB -------> new calib objs!!!!! AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnlineDelay" ; + const Char_t *sel1 = "ParOnlineDelay" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -656,11 +656,11 @@ Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from the CDB -------> new calib objs!!!!! AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Status" ; + const Char_t *sel1 = "Status" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -680,11 +680,11 @@ Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlineFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlineFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOnline" ; + const Char_t *sel1 = "ParOnline" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -704,11 +704,11 @@ Bool_t AliTOFcalib::ReadParOnlineFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from pulser from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Pulser" ; + const Char_t *sel1 = "Pulser" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -728,11 +728,11 @@ Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from noise from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "Noise" ; + const Char_t *sel1 = "Noise" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -752,11 +752,11 @@ Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from hardware from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "HW" ; + const Char_t *sel1 = "HW" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -776,11 +776,11 @@ Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadParOfflineFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadParOfflineFromCDB(const Char_t *sel, Int_t nrun) { //Read calibration parameters from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "ParOffline" ; + const Char_t *sel1 = "ParOffline" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -800,12 +800,12 @@ Bool_t AliTOFcalib::ReadParOfflineFromCDB(Char_t *sel, Int_t nrun) } //_____________________________________________________________________________ -void AliTOFcalib::WriteSimHistoOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo){ +void AliTOFcalib::WriteSimHistoOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo){ //Write Sim miscalibration parameters to the CDB fTOFSimToT=histo; AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "SimHisto" ; + const Char_t *sel1 = "SimHisto" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBMetaData *mdhisto = new AliCDBMetaData(); @@ -815,14 +815,14 @@ void AliTOFcalib::WriteSimHistoOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, TH delete mdhisto; } //_____________________________________________________________________________ -Bool_t AliTOFcalib::ReadSimHistoFromCDB(Char_t *sel, Int_t nrun) +Bool_t AliTOFcalib::ReadSimHistoFromCDB(const Char_t *sel, Int_t nrun) { //Read miscalibration parameters from the CDB AliCDBManager *man = AliCDBManager::Instance(); // The Tot Histo - Char_t *sel1 = "SimHisto" ; + const Char_t *sel1 = "SimHisto" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); @@ -839,13 +839,13 @@ Bool_t AliTOFcalib::ReadSimHistoFromCDB(Char_t *sel, Int_t nrun) return kTRUE; } //_____________________________________________________________________________ -void AliTOFcalib::WriteRecParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param){ +void AliTOFcalib::WriteRecParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param){ //Write reconstruction parameters to the CDB AliCDBManager *man = AliCDBManager::Instance(); AliCDBMetaData *md = new AliCDBMetaData(); md->SetResponsible("Silvia Arcelli"); - Char_t *sel1 = "RecPar" ; + const Char_t *sel1 = "RecPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBId id(out,minrun,maxrun); @@ -853,11 +853,11 @@ void AliTOFcalib::WriteRecParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliT delete md; } //_____________________________________________________________________________ -AliTOFRecoParam * AliTOFcalib::ReadRecParFromCDB(Char_t *sel, Int_t nrun) +AliTOFRecoParam * AliTOFcalib::ReadRecParFromCDB(const Char_t *sel, Int_t nrun) { //Read reconstruction parameters from the CDB AliCDBManager *man = AliCDBManager::Instance(); - Char_t *sel1 = "RecPar" ; + const Char_t *sel1 = "RecPar" ; Char_t out[100]; sprintf(out,"%s/%s",sel,sel1); AliCDBEntry *entry = man->Get(out,nrun); diff --git a/TOF/AliTOFcalib.h b/TOF/AliTOFcalib.h index 047d3f26b21..3263622be6a 100644 --- a/TOF/AliTOFcalib.h +++ b/TOF/AliTOFcalib.h @@ -67,40 +67,40 @@ public: // Methods to retrieve/write parameters from/on CDB // writing - void WriteSimHistoOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo); - void WriteConfigMapOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteConfigMapOnCDB(Char_t *sel); + void WriteSimHistoOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo); + void WriteConfigMapOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteConfigMapOnCDB(const Char_t *sel); // new calib objs - void WriteParOnlineDelayOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOnlineStatusOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOnlineDelayOnCDB(Char_t *sel); - void WriteParOnlineStatusOnCDB(Char_t *sel); + void WriteParOnlineDelayOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOnlineStatusOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOnlineDelayOnCDB(const Char_t *sel); + void WriteParOnlineStatusOnCDB(const Char_t *sel); // old calib objs - void WriteParOnlineOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOnlinePulserOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOnlineNoiseOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOnlineHWOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun); - void WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun); - void WriteParOnlineOnCDB(Char_t *sel); - void WriteParOnlinePulserOnCDB(Char_t *sel); // old, before unification of status info - void WriteParOnlineNoiseOnCDB(Char_t *sel); // old, before unification of status info - void WriteParOnlineHWOnCDB(Char_t *sel); // old, before unification of status info - void WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity); + void WriteParOnlineOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOnlinePulserOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOnlineNoiseOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOnlineHWOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun); + void WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun); + void WriteParOnlineOnCDB(const Char_t *sel); + void WriteParOnlinePulserOnCDB(const Char_t *sel); // old, before unification of status info + void WriteParOnlineNoiseOnCDB(const Char_t *sel); // old, before unification of status info + void WriteParOnlineHWOnCDB(const Char_t *sel); // old, before unification of status info + void WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity); // reading - Bool_t ReadSimHistoFromCDB(Char_t *sel, Int_t nrun); - Bool_t ReadConfigMapFromCDB(Char_t *sel, Int_t nrun); + Bool_t ReadSimHistoFromCDB(const Char_t *sel, Int_t nrun); + Bool_t ReadConfigMapFromCDB(const Char_t *sel, Int_t nrun); // new objs - Bool_t ReadParOnlineDelayFromCDB(Char_t *sel, Int_t nrun); - Bool_t ReadParOnlineStatusFromCDB(Char_t *sel, Int_t nrun); + Bool_t ReadParOnlineDelayFromCDB(const Char_t *sel, Int_t nrun); + Bool_t ReadParOnlineStatusFromCDB(const Char_t *sel, Int_t nrun); // old objs - Bool_t ReadParOnlineFromCDB(Char_t *sel, Int_t nrun); - Bool_t ReadParOnlinePulserFromCDB(Char_t *sel, Int_t nrun); // old, before unification of status info - Bool_t ReadParOnlineNoiseFromCDB(Char_t *sel, Int_t nrun); // old, before unification of status info - Bool_t ReadParOnlineHWFromCDB(Char_t *sel, Int_t nrun); // old, before unification of status info - Bool_t ReadParOfflineFromCDB(Char_t *sel, Int_t nrun); - void WriteRecParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param); - AliTOFRecoParam * ReadRecParFromCDB(Char_t *sel, Int_t nrun); + Bool_t ReadParOnlineFromCDB(const Char_t *sel, Int_t nrun); + Bool_t ReadParOnlinePulserFromCDB(const Char_t *sel, Int_t nrun); // old, before unification of status info + Bool_t ReadParOnlineNoiseFromCDB(const Char_t *sel, Int_t nrun); // old, before unification of status info + Bool_t ReadParOnlineHWFromCDB(const Char_t *sel, Int_t nrun); // old, before unification of status info + Bool_t ReadParOfflineFromCDB(const Char_t *sel, Int_t nrun); + void WriteRecParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param); + AliTOFRecoParam * ReadRecParFromCDB(const Char_t *sel, Int_t nrun); void CreateTreeFromCDB(Int_t minrun, Int_t maxrun); void CreateTreeFromFile(Int_t minrun, Int_t maxrun); void CreateTreeFromGrid(Int_t minrun, Int_t maxrun); diff --git a/TPC/AliTPCAltroEmulator.cxx b/TPC/AliTPCAltroEmulator.cxx index 15bdaa29b99..8b44b8f0d5d 100644 --- a/TPC/AliTPCAltroEmulator.cxx +++ b/TPC/AliTPCAltroEmulator.cxx @@ -925,7 +925,7 @@ int AliTPCAltroEmulator::InBand(int ADC,int bsl, int LowThreshold, int HighThres return 0; } -int AliTPCAltroEmulator::InRange(int parameter,int Low,int High,char *Module,char *ParameterName){ +int AliTPCAltroEmulator::InRange(int parameter,int Low,int High,const char *Module,const char *ParameterName){ // // // diff --git a/TPC/AliTPCAltroEmulator.h b/TPC/AliTPCAltroEmulator.h index 08435a9727e..210416905ae 100644 --- a/TPC/AliTPCAltroEmulator.h +++ b/TPC/AliTPCAltroEmulator.h @@ -124,7 +124,7 @@ public: void SetElement(short* Array,int index,short value); int InBand(int ADC,int bsl, int LowThreshold, int HighThreshold); - int InRange(int parameter,int Low,int High,char *Module,char *ParameterName); + int InRange(int parameter,int Low,int High,const char *Module,const char *ParameterName); short GetShortChannel(int i); short GetKeepChannel(int i); int Multiply36(int P, int N); diff --git a/TPC/AliTPCCalibCE.cxx b/TPC/AliTPCCalibCE.cxx index 269a41de6e5..4618d84a1c8 100644 --- a/TPC/AliTPCCalibCE.cxx +++ b/TPC/AliTPCCalibCE.cxx @@ -1318,7 +1318,7 @@ Bool_t AliTPCCalibCE::ProcessEvent(eventHeaderStruct *event) //_____________________________________________________________________ TH2S* AliTPCCalibCE::GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force) + const Char_t *type, Bool_t force) { // // return pointer to TH2S histogram of 'type' @@ -1373,7 +1373,7 @@ TH2S* AliTPCCalibCE::GetHistoRMS(Int_t sector, Bool_t force) } //_____________________________________________________________________ TH1S* AliTPCCalibCE::GetHisto(Int_t sector, TObjArray *arr, - Char_t *type, Bool_t force) + const Char_t *type, Bool_t force) { // // return pointer to TH1S histogram diff --git a/TPC/AliTPCCalibCE.h b/TPC/AliTPCCalibCE.h index 566fa079bea..11a5f7ccd18 100644 --- a/TPC/AliTPCCalibCE.h +++ b/TPC/AliTPCCalibCE.h @@ -234,9 +234,9 @@ private: TH2S* GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force); + const Char_t *type, Bool_t force); TH1S* GetHisto(Int_t sector, TObjArray *arr, - Char_t *type, Bool_t force); + const Char_t *type, Bool_t force); AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const; diff --git a/TPC/AliTPCCalibPedestal.cxx b/TPC/AliTPCCalibPedestal.cxx index 83e077a35a9..594d884fda7 100644 --- a/TPC/AliTPCCalibPedestal.cxx +++ b/TPC/AliTPCCalibPedestal.cxx @@ -522,7 +522,7 @@ Bool_t AliTPCCalibPedestal::TestEvent() //_____________________________________________________________________ TH2F* AliTPCCalibPedestal::GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force) + const Char_t *type, Bool_t force) { // // return pointer to Q histogram diff --git a/TPC/AliTPCCalibPedestal.h b/TPC/AliTPCCalibPedestal.h index 79e664cce2d..a56aff05129 100644 --- a/TPC/AliTPCCalibPedestal.h +++ b/TPC/AliTPCCalibPedestal.h @@ -105,7 +105,7 @@ private: TH2F* GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force); + const Char_t *type, Bool_t force); AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force); diff --git a/TPC/AliTPCCalibPulser.cxx b/TPC/AliTPCCalibPulser.cxx index 95bb7f6ef04..9530f84feab 100644 --- a/TPC/AliTPCCalibPulser.cxx +++ b/TPC/AliTPCCalibPulser.cxx @@ -881,7 +881,7 @@ Bool_t AliTPCCalibPulser::ProcessEvent(eventHeaderStruct *event) //_____________________________________________________________________ TH2S* AliTPCCalibPulser::GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force) + const Char_t *type, Bool_t force) { // // return pointer to Q histogram diff --git a/TPC/AliTPCCalibPulser.h b/TPC/AliTPCCalibPulser.h index e7033a762bf..5e064a94779 100644 --- a/TPC/AliTPCCalibPulser.h +++ b/TPC/AliTPCCalibPulser.h @@ -175,7 +175,7 @@ private: TH2S* GetHisto(Int_t sector, TObjArray *arr, Int_t nbinsY, Float_t ymin, Float_t ymax, - Char_t *type, Bool_t force); + const Char_t *type, Bool_t force); AliTPCCalROC* GetCalRoc(Int_t sector, TObjArray* arr, Bool_t force) const; diff --git a/TPC/AliTPCCalibViewer.cxx b/TPC/AliTPCCalibViewer.cxx index b44c630ffab..c81218bd3cb 100644 --- a/TPC/AliTPCCalibViewer.cxx +++ b/TPC/AliTPCCalibViewer.cxx @@ -130,7 +130,7 @@ AliTPCCalibViewer::AliTPCCalibViewer(TTree* tree) } //_____________________________________________________________________________ -AliTPCCalibViewer::AliTPCCalibViewer(char* fileName, char* treeName) +AliTPCCalibViewer::AliTPCCalibViewer(const char* fileName, const char* treeName) :TObject(), fTree(0), fFile(0), @@ -1535,7 +1535,7 @@ TH1F* AliTPCCalibViewer::Integrate(Int_t n, Float_t *array, Int_t nbins, Float_t //_____________________________________________________________________________ -AliTPCCalPad* AliTPCCalibViewer::GetCalPadOld(const char* desiredData, char* cuts, char* calPadName) const { +AliTPCCalPad* AliTPCCalibViewer::GetCalPadOld(const char* desiredData, const char* cuts, const char* calPadName) const { // // creates a AliTPCCalPad out of the 'desiredData' // the functionality of EasyDraw1D is used @@ -1561,7 +1561,7 @@ AliTPCCalPad* AliTPCCalibViewer::GetCalPadOld(const char* desiredData, char* cut //_____________________________________________________________________________ -AliTPCCalPad* AliTPCCalibViewer::GetCalPad(const char* desiredData, char* cuts, char* calPadName) const { +AliTPCCalPad* AliTPCCalibViewer::GetCalPad(const char* desiredData, const char* cuts, const char* calPadName) const { // // creates a AliTPCCalPad out of the 'desiredData' // the functionality of EasyDraw1D is used diff --git a/TPC/AliTPCCalibViewer.h b/TPC/AliTPCCalibViewer.h index a0b76734e7e..dbba4b997fe 100644 --- a/TPC/AliTPCCalibViewer.h +++ b/TPC/AliTPCCalibViewer.h @@ -28,7 +28,7 @@ public: AliTPCCalibViewer(); AliTPCCalibViewer(const AliTPCCalibViewer &c); AliTPCCalibViewer(TTree* tree); - AliTPCCalibViewer(char* fileName, char* treeName = "calPads"); + AliTPCCalibViewer(const char* fileName, const char* treeName = "calPads"); AliTPCCalibViewer &operator = (const AliTPCCalibViewer & param); virtual ~AliTPCCalibViewer(); virtual void Delete(Option_t* option = ""); @@ -58,8 +58,8 @@ public: Int_t Integrate(const char* drawCommand, Int_t sector, const char* cuts = 0, Float_t sigmaMax = 5, Bool_t plotMean = kTRUE, Bool_t plotMedian = kTRUE, Bool_t plotLTM = kTRUE, const char *sigmas = "", Float_t sigmaStep = -1) const; // draws an integrated histogram Int_t IntegrateOld(const char* drawCommand, const char* sector, const char* cuts = 0, Float_t sigmaMax = 5, Bool_t plotMean = kTRUE, Bool_t plotMedian = kTRUE, Bool_t plotLTM = kTRUE, const char *sigmas = "", Float_t sigmaStep = -1) const; // draws an integrated histogram - AliTPCCalPad* GetCalPadOld(const char* desiredData, char* cuts = "", char* calPadName = "NoName") const; // returns an AliTPCCalPad object containing the specified data with cuts applied - AliTPCCalPad* GetCalPad(const char* desiredData, char* cuts = "", char* calPadName = "NoName") const; // returns an AliTPCCalPad object containing the specified data with cuts applied + AliTPCCalPad* GetCalPadOld(const char* desiredData, const char* cuts = "", const char* calPadName = "NoName") const; // returns an AliTPCCalPad object containing the specified data with cuts applied + AliTPCCalPad* GetCalPad(const char* desiredData, const char* cuts = "", const char* calPadName = "NoName") const; // returns an AliTPCCalPad object containing the specified data with cuts applied AliTPCCalROC* GetCalROC(const char* desiredData, UInt_t sector, char* cuts = "") const; // returns an AliTPCCalROC object containing the specified data for sector with cuts applied diff --git a/TPC/AliTPCCalibViewerGUI.cxx b/TPC/AliTPCCalibViewerGUI.cxx index 4a87107b3e2..026bc98df4c 100644 --- a/TPC/AliTPCCalibViewerGUI.cxx +++ b/TPC/AliTPCCalibViewerGUI.cxx @@ -1223,7 +1223,7 @@ void AliTPCCalibViewerGUI::CloseWindow() { */ -void AliTPCCalibViewerGUI::Initialize(char* fileName, char* treeName) { +void AliTPCCalibViewerGUI::Initialize(const char* fileName, const char* treeName) { // // initialize the GUI with a calibrationTree from fileName // diff --git a/TPC/AliTPCCalibViewerGUI.h b/TPC/AliTPCCalibViewerGUI.h index 7b51b0ae1c4..7353683e9d7 100644 --- a/TPC/AliTPCCalibViewerGUI.h +++ b/TPC/AliTPCCalibViewerGUI.h @@ -61,7 +61,7 @@ public: void DrawGUI(const TGWindow *p, UInt_t w, UInt_t h); // to be called by the costructor, here the windows is drawn void SetInitialValues(); // set the initial button states - void Initialize(char* fileName, char* treeName = "calPads"); // initializes the GUI with default settings and opens tree for drawing + void Initialize(const char* fileName, const char* treeName = "calPads"); // initializes the GUI with default settings and opens tree for drawing void Initialize(AliTPCCalibViewer *viewer); // initializes the GUI with default settings and opens tree for drawing void Reload(){Initialize(fViewer);} // reload the viewr after it has been changed, e.g. added a new referenceTree, ... TString* GetDrawString(); // create the draw string out of selection diff --git a/TPC/AliTPCLaserTracks.cxx b/TPC/AliTPCLaserTracks.cxx index 3e606bede92..bef2d0d117b 100644 --- a/TPC/AliTPCLaserTracks.cxx +++ b/TPC/AliTPCLaserTracks.cxx @@ -192,11 +192,12 @@ Double_t AliTPCLaserTracks::FindBeamLength(TVector3 vF, TVector3 vP) //if we cross two boarders on our way return the closer boarder - if ( (n1>0) && (n2>0) ) + if ( (n1>0) && (n2>0) ) { if ( (vF-vI1).Mag() <= (vF-vI2).Mag() ) return (vF-vI1).Mag(); else - return (vF-vI2).Mag(); + return (vF-vI2).Mag(); + } if ( n1>0 ) return (vF-vI1).Mag(); diff --git a/TPC/AliTPCMonitor.cxx b/TPC/AliTPCMonitor.cxx index 4496356b9e6..c432bcdfb79 100755 --- a/TPC/AliTPCMonitor.cxx +++ b/TPC/AliTPCMonitor.cxx @@ -2507,7 +2507,7 @@ Double_t AliTPCMonitor::Gamma4(Double_t* x, Double_t* par) { } //__________________________________________________________________ -TCanvas* AliTPCMonitor::CreateCanvas(Char_t* name) +TCanvas* AliTPCMonitor::CreateCanvas(const Char_t* name) { // Create Canvases diff --git a/TPC/AliTPCMonitor.h b/TPC/AliTPCMonitor.h index ad84a76185b..05584d3ec5d 100755 --- a/TPC/AliTPCMonitor.h +++ b/TPC/AliTPCMonitor.h @@ -52,7 +52,7 @@ class AliTPCMonitor : public AliTPCMonitorConfig { virtual ~AliTPCMonitor(); Int_t CheckEqId(Int_t secid, Int_t eqid); - TCanvas* CreateCanvas(char* name); + TCanvas* CreateCanvas(const char* name); void CreateHistos(); void DeleteHistos(); diff --git a/TPC/AliTPCclustererKr.cxx b/TPC/AliTPCclustererKr.cxx index b093b6a79a0..12eb1bab8c3 100644 --- a/TPC/AliTPCclustererKr.cxx +++ b/TPC/AliTPCclustererKr.cxx @@ -673,7 +673,7 @@ Int_t AliTPCclustererKr::FindClusterKrIO() for(Int_t iTimeBin=1;iTimeBinSetResponsible("Dariusz Miskowiec"); diff --git a/TRD/AliTRDrawTPStream.cxx b/TRD/AliTRDrawTPStream.cxx index 6e5c68d96c7..f126900b65a 100644 --- a/TRD/AliTRDrawTPStream.cxx +++ b/TRD/AliTRDrawTPStream.cxx @@ -367,7 +367,7 @@ void AliTRDrawTPStream::DumpCnf(Int_t slv) //--------------------------------------------------------------------- -Char_t * AliTRDrawTPStream::Addr2Name(UInt_t addr) +const Char_t * AliTRDrawTPStream::Addr2Name(UInt_t addr) { Int_t idx; idx = 0; diff --git a/TRD/AliTRDrawTPStream.h b/TRD/AliTRDrawTPStream.h index afa595a9d0b..ec5c80aedc1 100644 --- a/TRD/AliTRDrawTPStream.h +++ b/TRD/AliTRDrawTPStream.h @@ -41,14 +41,14 @@ class AliTRDrawTPStream : public AliTRDrawStreamBase public: struct SimpleRegs { - Char_t * fName; //! Name of the register + const Char_t * fName; //! Name of the register UInt_t fAddr; // Address in GIO of TRAP UInt_t fNbits; // Number of bits, from 1 to 32 UInt_t fResVal; // reset value [mj] }; struct CmdRegs{ - Char_t * fName; //! Name of the command register + const Char_t * fName; //! Name of the command register UInt_t fAddr; // Address in GIO of TRAP }; @@ -62,7 +62,7 @@ class AliTRDrawTPStream : public AliTRDrawStreamBase Int_t AddrIsDmem(UInt_t addr); Int_t AddrIsDbank(UInt_t addr); UInt_t Addr2Idx(UInt_t addr); - Char_t * Addr2Name(UInt_t addr); //! + const Char_t * Addr2Name(UInt_t addr); //! Char_t CnfStat(UInt_t prop); void PowerUp(); void DumpCnf(Int_t slv); diff --git a/TRD/Cal/AliTRDCalPID.cxx b/TRD/Cal/AliTRDCalPID.cxx index c4df831481e..341c3dcd07a 100644 --- a/TRD/Cal/AliTRDCalPID.cxx +++ b/TRD/Cal/AliTRDCalPID.cxx @@ -39,8 +39,8 @@ ClassImp(AliTRDCalPID) -Char_t* AliTRDCalPID::fPartName[AliPID::kSPECIES] = { "electron", "muon", "pion", "kaon", "proton"}; -Char_t* AliTRDCalPID::fPartSymb[AliPID::kSPECIES] = { "EL", "MU", "PI", "KA", "PR"}; +const Char_t* AliTRDCalPID::fPartName[AliPID::kSPECIES] = { "electron", "muon", "pion", "kaon", "proton"}; +const Char_t* AliTRDCalPID::fPartSymb[AliPID::kSPECIES] = { "EL", "MU", "PI", "KA", "PR"}; Color_t AliTRDCalPID::fPartColor[AliPID::kSPECIES] = { kRed, kGreen, kBlue, kYellow, kMagenta}; Float_t AliTRDCalPID::fTrackMomentum[kNMom] = { 0.6, 0.8, 1.0, 1.5, 2.0 diff --git a/TRD/Cal/AliTRDCalPID.h b/TRD/Cal/AliTRDCalPID.h index cb52e8e91cf..c7811a4b4c7 100644 --- a/TRD/Cal/AliTRDCalPID.h +++ b/TRD/Cal/AliTRDCalPID.h @@ -44,11 +44,11 @@ class AliTRDCalPID : public TNamed , Float_t length, Int_t plane) const = 0; static Color_t GetPartColor(Int_t i) { return fPartColor[i]; } static Int_t GetPartIndex(Int_t pdg); - static Char_t *GetPartName(Int_t i) { return fPartName[i]; } - static Char_t *GetPartSymb(Int_t i) { return fPartSymb[i]; } + static const Char_t *GetPartName(Int_t i) { return fPartName[i]; } + static const Char_t *GetPartSymb(Int_t i) { return fPartSymb[i]; } - void SetPartName(Int_t i, Char_t *name) { fPartName[i] = name; } - void SetPartSymb(Int_t i, Char_t *symb) { fPartSymb[i] = symb; } + void SetPartName(Int_t i, const Char_t *name) { fPartName[i] = name; } + void SetPartSymb(Int_t i, const Char_t *symb) { fPartSymb[i] = symb; } protected: @@ -62,8 +62,8 @@ class AliTRDCalPID : public TNamed protected: - static Char_t *fPartName[AliPID::kSPECIES]; //! Names of particle species - static Char_t *fPartSymb[AliPID::kSPECIES]; //! Symbols of particle species + static const Char_t *fPartName[AliPID::kSPECIES]; //! Names of particle species + static const Char_t *fPartSymb[AliPID::kSPECIES]; //! Symbols of particle species static Color_t fPartColor[AliPID::kSPECIES]; //! Colors of particle species static Float_t fTrackMomentum[kNMom]; // Track momenta for which response functions are available TObjArray *fModel; // Model for probability estimate diff --git a/TRD/qaRec/run.h b/TRD/qaRec/run.h index f7a751e15fd..1cc08e6c16d 100644 --- a/TRD/qaRec/run.h +++ b/TRD/qaRec/run.h @@ -19,7 +19,7 @@ enum AliTRDrecoTasks{ ,kPIDRefMaker = 7 }; -Char_t* fgkTRDtaskClassName[NTRDTASKS] = { +const Char_t* fgkTRDtaskClassName[NTRDTASKS] = { "AliTRDcheckDetector" ,"AliTRDtrackingEfficiency" ,"AliTRDtrackingEfficiencyCombined" @@ -29,7 +29,7 @@ Char_t* fgkTRDtaskClassName[NTRDTASKS] = { ,"AliTRDpidRefMaker" }; -Char_t *fgkTRDtaskOpt[NTRDTASKS+3] = { +const Char_t *fgkTRDtaskOpt[NTRDTASKS+3] = { "ALL" ,"DET" ,"EFF" diff --git a/UNICOR/AliDHN.cxx b/UNICOR/AliDHN.cxx index f02d9d9f9aa..0c35addfd0c 100644 --- a/UNICOR/AliDHN.cxx +++ b/UNICOR/AliDHN.cxx @@ -9,6 +9,8 @@ //============================================================================= #include +#include + #include #include #include diff --git a/build/module.dep b/build/module.dep index 17cb3f80797..0637c4b416b 100644 --- a/build/module.dep +++ b/build/module.dep @@ -51,8 +51,6 @@ STAT/module.mk: STAT/libSTAT.pkg BCM/module.mk: BCM/libBCM.pkg DPMJET/module.mk: DPMJET/libdpmjet.pkg TDPMjet/module.mk: TDPMjet/libTDPMjet.pkg -ISAJET/module.mk: ISAJET/libisajet.pkg -TIsajet/module.mk: TIsajet/libTIsajet.pkg TTherminator/module.mk: TTherminator/libTTherminator.pkg CORRFW/module.mk: CORRFW/libCORRFW.pkg UNICOR/module.mk: UNICOR/libUNICOR.pkg -- 2.39.3