From 90cceaf6d2e2e6b2e735135cb2d6562308e10ed7 Mon Sep 17 00:00:00 2001 From: schutz Date: Thu, 4 Sep 2003 15:39:56 +0000 Subject: [PATCH] Compilation warnings fixed --- PHOS/AliPHOSAnalyze.cxx | 10 +++++----- PHOS/AliPHOSAnalyze.h | 12 +++++------- PHOS/AliPHOSCalibrationDB.cxx | 2 +- PHOS/AliPHOSCalibrationDB.h | 2 +- PHOS/AliPHOSCalibrator.cxx | 2 +- PHOS/AliPHOSCalibrator.h | 2 +- PHOS/AliPHOSClusterizer.h | 16 ++++++++-------- PHOS/AliPHOSConTableDB.cxx | 2 +- PHOS/AliPHOSConTableDB.h | 2 +- PHOS/AliPHOSDigitizer.cxx | 4 ++-- PHOS/AliPHOSDigitizer.h | 2 +- PHOS/AliPHOSFastRecParticle.cxx | 2 +- PHOS/AliPHOSFastRecParticle.h | 4 ++-- PHOS/AliPHOSGammaJet.cxx | 19 +++++++++---------- PHOS/AliPHOSGammaJet.h | 12 ++++++------ PHOS/AliPHOSIhepAnalyze.cxx | 2 +- PHOS/AliPHOSIhepAnalyze.h | 2 +- PHOS/AliPHOSJet.cxx | 4 ++-- PHOS/AliPHOSJet.h | 4 ++-- PHOS/AliPHOSJetFinder.cxx | 6 +++--- PHOS/AliPHOSJetFinder.h | 2 +- PHOS/AliPHOSPID.h | 6 ++---- PHOS/AliPHOSPIDv1.cxx | 4 ++-- PHOS/AliPHOSPIDv1.h | 2 +- PHOS/AliPHOSQAObjectCheckable.h | 2 +- PHOS/AliPHOSRaw2Digits.cxx | 4 ++-- PHOS/AliPHOSRaw2Digits.h | 4 ++-- PHOS/AliPHOSRecCpvManager.cxx | 2 +- PHOS/AliPHOSRecCpvManager.h | 2 +- PHOS/AliPHOSRecEmcManager.cxx | 6 +++--- PHOS/AliPHOSRecEmcManager.h | 6 +++--- PHOS/AliPHOSRecManager.h | 5 ++--- PHOS/AliPHOSReconstructioner.cxx | 6 +++--- PHOS/AliPHOSReconstructioner.h | 4 ++-- PHOS/AliPHOSTrackSegment.cxx | 2 +- PHOS/AliPHOSTrackSegment.h | 2 +- PHOS/AliPHOSTrackSegmentMaker.h | 4 ++-- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 4 ++-- PHOS/AliPHOSTrackSegmentMakerv1.h | 2 +- PHOS/AliPHOSv1.cxx | 4 ++-- PHOS/AliPHOSv1.h | 2 +- 41 files changed, 90 insertions(+), 96 deletions(-) diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx index b94966759bb..66e06ba388b 100644 --- a/PHOS/AliPHOSAnalyze.cxx +++ b/PHOS/AliPHOSAnalyze.cxx @@ -128,7 +128,7 @@ AliPHOSAnalyze::~AliPHOSAnalyze() } //____________________________________________________________________________ -void AliPHOSAnalyze::DrawRecon(Int_t Nevent,Int_t Nmod,const char * branchName,const char* branchTitle){ +void AliPHOSAnalyze::DrawRecon(Int_t Nevent,Int_t Nmod){ //Draws pimary particles and reconstructed //digits, RecPoints, RecPartices etc //for event Nevent in the module Nmod. @@ -469,7 +469,7 @@ void AliPHOSAnalyze::Ls(){ Info("LS", message.Data()) ; } //____________________________________________________________________________ - void AliPHOSAnalyze::InvariantMass(const char* branchTitle) + void AliPHOSAnalyze::InvariantMass() { // Calculates Real and Mixed invariant mass distributions if (fRunLoader == 0x0) @@ -632,7 +632,7 @@ void AliPHOSAnalyze::Ls(){ } //____________________________________________________________________________ - void AliPHOSAnalyze::EnergyResolution(const char * branchTitle) + void AliPHOSAnalyze::EnergyResolution() { //fills two dimentional histo: energy of primary vs. energy of reconstructed @@ -771,7 +771,7 @@ void AliPHOSAnalyze::Ls(){ } //____________________________________________________________________________ -void AliPHOSAnalyze::PositionResolution(const char * branchTitle) +void AliPHOSAnalyze::PositionResolution() { //fills two dimentional histo: energy vs. primary - reconstructed distance @@ -925,7 +925,7 @@ void AliPHOSAnalyze::PositionResolution(const char * branchTitle) } //____________________________________________________________________________ -void AliPHOSAnalyze::Contamination(const char* RecPointsTitle){ +void AliPHOSAnalyze::Contamination(){ // fills spectra of primary photons and several kinds of // reconstructed particles, so that analyzing them one can // estimate conatmination, efficiency of registration etc. diff --git a/PHOS/AliPHOSAnalyze.h b/PHOS/AliPHOSAnalyze.h index e08073d6f78..399af2dd8c8 100644 --- a/PHOS/AliPHOSAnalyze.h +++ b/PHOS/AliPHOSAnalyze.h @@ -36,18 +36,16 @@ public: AliPHOSAnalyze(const AliPHOSAnalyze & ana) ; // cpy ctor virtual ~AliPHOSAnalyze() ; // dtor - void DrawRecon(Int_t Nevent= 0,Int_t Nmod = 1, - const char* branchName = "PHOSRP", - const char* branchTitle = "Default") ; + void DrawRecon(Int_t Nevent= 0,Int_t Nmod = 1) ; // draws positions of entering of primaries and reconstructed objects in PHOS - void InvariantMass(const char* RecPartTitle = "Default") ; // Photons invariant mass distributions + void InvariantMass() ; // Photons invariant mass distributions - void EnergyResolution (const char* RecPartTitle = "Default") ; // analyzes Energy resolution ; + void EnergyResolution () ; // analyzes Energy resolution ; - void PositionResolution(const char* RecPartTitle = "Default") ; // analyzes Position resolution ; + void PositionResolution() ; // analyzes Position resolution ; - void Contamination(const char* RecPartTitle = "Default") ; // Counts contamination of photon spectrum + void Contamination() ; // Counts contamination of photon spectrum void Ls() ; //Prints PHOS-related contents of TreeS, TreeD and TreeR diff --git a/PHOS/AliPHOSCalibrationDB.cxx b/PHOS/AliPHOSCalibrationDB.cxx index 2e9bb666b65..a324c237ff6 100644 --- a/PHOS/AliPHOSCalibrationDB.cxx +++ b/PHOS/AliPHOSCalibrationDB.cxx @@ -42,7 +42,7 @@ ClassImp(AliPHOSCalibrationDB) fctdb = 0 ; } //____________________________________________________________________________ -AliPHOSCalibrationDB::AliPHOSCalibrationDB(const char* filename ,const char * database): +AliPHOSCalibrationDB::AliPHOSCalibrationDB(const char * database): TNamed("AliPHOSCalibrationDB",database){ //Creates the containers: we prepare places for all channels in PHOS diff --git a/PHOS/AliPHOSCalibrationDB.h b/PHOS/AliPHOSCalibrationDB.h index a82d5a46ca9..a4c5cb999e3 100644 --- a/PHOS/AliPHOSCalibrationDB.h +++ b/PHOS/AliPHOSCalibrationDB.h @@ -24,7 +24,7 @@ class AliPHOSCalibrationDB:public TNamed { public: AliPHOSCalibrationDB() ; // ctor - AliPHOSCalibrationDB(const char* filename ,const char * database = "Primordial") ; + AliPHOSCalibrationDB(const char * database) ; virtual ~AliPHOSCalibrationDB() ; // dtor //Main method: calibrates if gains are known, otherwise - returns 0 diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx index 7a49f010703..767673694a9 100644 --- a/PHOS/AliPHOSCalibrator.cxx +++ b/PHOS/AliPHOSCalibrator.cxx @@ -634,7 +634,7 @@ void AliPHOSCalibrator::WriteGains(const char * version, cmngr->WriteData(&gains) ; } //_____________________________________________________________________________ -void AliPHOSCalibrator::Print(const Option_t * option)const +void AliPHOSCalibrator::Print(const Option_t *)const { // prints everything printf("--------------AliPHOSCalibrator-----------------\n") ; diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h index ec0e26686ba..a5624705241 100644 --- a/PHOS/AliPHOSCalibrator.h +++ b/PHOS/AliPHOSCalibrator.h @@ -48,7 +48,7 @@ public: void PlotGain(Int_t channel) ; //Plot histo with gains for a channel void PlotGains() ; //Plot all gains - void Print(const Option_t * option) const ; + virtual void Print(const Option_t *) const ; TH1F * PedestalHisto(Int_t channel) {return dynamic_cast(fPedHistos->At(channel)) ;} ; diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h index 21c96610af8..1dec4add7de 100644 --- a/PHOS/AliPHOSClusterizer.h +++ b/PHOS/AliPHOSClusterizer.h @@ -39,15 +39,15 @@ public: virtual void MakeClusters() {Warning("MakeClusters", "Not Defined" ) ; } virtual void Print()const {Warning("Print", "Not Defined" ) ; } - virtual void SetEmcClusteringThreshold(Float_t) = 0;//{Warning("SetEmcClusteringThreshold", "Not Defined" ) ; } - virtual void SetEmcLocalMaxCut(Float_t ) = 0;//cut) {Warning("SetEmcLocalMaxCut", "Not Defined" ) ; } + virtual void SetEmcClusteringThreshold(Float_t) = 0; + virtual void SetEmcLocalMaxCut(Float_t ) = 0; - virtual void SetEmcLogWeight(Float_t) = 0;// w) {Warning("SetEmcLogWeight", "Not Defined" ) ; } - virtual void SetEmcTimeGate(Float_t) = 0;// gate) {Warning("SetEmcTimeGate", "Not Defined" ) ; } - virtual void SetCpvClusteringThreshold(Float_t) = 0;// cluth) {Warning("SetCpvClusteringThreshold", "Not Defined" ) ; } - virtual void SetCpvLocalMaxCut(Float_t) = 0;// cut) {Warning("SetCpvLocalMaxCut", "Not Defined" ) ; } - virtual void SetCpvLogWeight(Float_t) = 0;// w) {Warning("SetCpvLogWeight", "Not Defined" ) ; } - virtual void SetUnfolding(Bool_t) = 0;// toUnfold ){Warning("SetUnfolding", "Not Defined" ) ;} + virtual void SetEmcLogWeight(Float_t) = 0; + virtual void SetEmcTimeGate(Float_t) = 0; + virtual void SetCpvClusteringThreshold(Float_t) = 0; + virtual void SetCpvLocalMaxCut(Float_t) = 0; + virtual void SetCpvLogWeight(Float_t) = 0; + virtual void SetUnfolding(Bool_t) = 0; void SetEventFolderName(TString name) { fEventFolderName = name ; } AliPHOSClusterizer & operator = (const AliPHOSClusterizer & rvalue) {return *this ;} diff --git a/PHOS/AliPHOSConTableDB.cxx b/PHOS/AliPHOSConTableDB.cxx index c86423f6395..76d3a1a7dc7 100644 --- a/PHOS/AliPHOSConTableDB.cxx +++ b/PHOS/AliPHOSConTableDB.cxx @@ -190,7 +190,7 @@ Int_t AliPHOSConTableDB::Raw2AbsId(Int_t rawId)const{ return 0 ; } //____________________________________________________________________________ -void AliPHOSConTableDB::Print(Option_t * option)const { +void AliPHOSConTableDB::Print(Option_t *)const { //prints configuraion TString message ; diff --git a/PHOS/AliPHOSConTableDB.h b/PHOS/AliPHOSConTableDB.h index abd5f892ad2..4e43626e01f 100644 --- a/PHOS/AliPHOSConTableDB.h +++ b/PHOS/AliPHOSConTableDB.h @@ -53,7 +53,7 @@ public: //Transforms AbsId number in PHOS into channel number in prototype Int_t AbsId2Raw(Int_t AbsId)const ; - virtual void Print(Option_t * option="") const ; + virtual void Print(Option_t *) const ; AliPHOSConTableDB& operator=(const AliPHOSConTableDB& cdb) ; diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index f14a654cca6..de9983a147b 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -419,7 +419,7 @@ void AliPHOSDigitizer::Exec(Option_t *option) Digitize(ievent) ; //Add prepared SDigits to digits and add the noise - WriteDigits(ievent) ; + WriteDigits() ; if(strstr(option,"deb")) PrintDigits(option); @@ -705,7 +705,7 @@ void AliPHOSDigitizer::Unload() } //____________________________________________________________________________ -void AliPHOSDigitizer::WriteDigits(Int_t event) +void AliPHOSDigitizer::WriteDigits() { // Makes TreeD in the output file. diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h index 30c61f70209..480d41051f9 100644 --- a/PHOS/AliPHOSDigitizer.h +++ b/PHOS/AliPHOSDigitizer.h @@ -84,7 +84,7 @@ private: void InitParameters() ; void PrintDigits(Option_t * option) ; void Unload() ; - void WriteDigits(Int_t evt) ; // Writes Digits for particular event + void WriteDigits() ; // Writes Digits for the current event Float_t TimeOfNoise(void) const; // Calculate time signal generated by noise //Calculate the time of crossing of the threshold by front edge diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx index d2b8cfa7ca4..a89faa6e33d 100644 --- a/PHOS/AliPHOSFastRecParticle.cxx +++ b/PHOS/AliPHOSFastRecParticle.cxx @@ -461,7 +461,7 @@ void AliPHOSFastRecParticle::Paint(Option_t *) } //____________________________________________________________________________ -void AliPHOSFastRecParticle::Print(Option_t * opt)const +void AliPHOSFastRecParticle::Print(Option_t *)const { // Print the type, energy and momentum of the reconstructed particle diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h index dd2c1ea6b4b..cc89e0f65a6 100644 --- a/PHOS/AliPHOSFastRecParticle.h +++ b/PHOS/AliPHOSFastRecParticle.h @@ -39,7 +39,7 @@ class AliPHOSFastRecParticle : public TParticle { return fIndexInList ; } virtual const Int_t GetNPrimaries() const {return 0 ;} - virtual const TParticle * GetPrimary(Int_t index=0) const {return 0 ;} + virtual const TParticle * GetPrimary(Int_t) const {return 0 ;} const Int_t GetType() const { // returns the type of the particle return fType ; @@ -71,7 +71,7 @@ class AliPHOSFastRecParticle : public TParticle { TString Name() const ; virtual void Paint(Option_t * option=""); - virtual void Print(Option_t * option="") const ; + virtual void Print(Option_t *) const ; void SetType(Int_t type) ; diff --git a/PHOS/AliPHOSGammaJet.cxx b/PHOS/AliPHOSGammaJet.cxx index 26eb861df7f..4be1e19164f 100644 --- a/PHOS/AliPHOSGammaJet.cxx +++ b/PHOS/AliPHOSGammaJet.cxx @@ -48,7 +48,7 @@ AliPHOSGammaJet::AliPHOSGammaJet(const TString inputfilename) { } //____________________________________________________________________________ -AliPHOSGammaJet::AliPHOSGammaJet(const AliPHOSGammaJet * gj) { +AliPHOSGammaJet::AliPHOSGammaJet(const AliPHOSGammaJet & gj) : TTask(gj) { } //____________________________________________________________________________ @@ -56,7 +56,7 @@ AliPHOSGammaJet::~AliPHOSGammaJet() { } //____________________________________________________________________________ -void AliPHOSGammaJet::Exec(Option_t *option) +void AliPHOSGammaJet::Exec(Option_t *) { // does the job @@ -117,7 +117,7 @@ void AliPHOSGammaJet::Exec(Option_t *option) Int_t id_g = -1; GetGammaJet(particleList,gamma, id_g); GetLeadingCharge(particleList,charge, id_g); - GetLeadingPi0(particleList,pi0, id_g); + GetLeadingPi0(particleList,pi0); Info("Pi0Decay", "Gamma: %f %d", gamma.Energy(), id_g) ; Info("Pi0Decay", "Charge: %f", charge.Energy()) ; Info("Pi0Decay", "Pi0: %f", pi0.Energy()) ; @@ -219,7 +219,7 @@ void AliPHOSGammaJet::GetLeadingCharge(TList &particleList, TLorentzVector &char } //____________________________________________________________________________ -void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0, Int_t & id) +void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0) { TParticle *particle = 0x0; @@ -231,7 +231,6 @@ void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0, In Int_t ksCode = particle->GetStatusCode(); if((ksCode == 2)) - //&&(id != iPrimary)&&(particle->GetPdgCode() == 111)) { pt_i = particle->Pt(); if(pt_i> pt_max){ @@ -243,10 +242,10 @@ void AliPHOSGammaJet::GetLeadingPi0(TList &particleList, TLorentzVector &pi0, In } //____________________________________________________________________________ -void AliPHOSGammaJet::GetLeadingGammaPair(TList &particleList, TLorentzVector &gammapair, Int_t & id, - Double_t & thetacut,Double_t & ratiocut1, Double_t & ratiocut2, - Double_t & invmasscut1,Double_t & invmasscut2) -{ +// void AliPHOSGammaJet::GetLeadingGammaPair(TList &particleList, TLorentzVector &gammapair, Int_t & id, +// Double_t & thetacut,Double_t & ratiocut1, Double_t & ratiocut2, +// Double_t & invmasscut1,Double_t & invmasscut2) +// { // TParticle *particle = 0x0; // Int_t iPrimary=-1; @@ -289,4 +288,4 @@ void AliPHOSGammaJet::GetLeadingGammaPair(TList &particleList, TLorentzVector &g // }// if kscode 1 // }//while // // cout<<"iPrimary "<GetArray() ;} Bool_t IsInCone(const TParticle * p)const ; - Bool_t IsInCone(const Double_t e,const Double_t eta,const Double_t phi)const ; + Bool_t IsInCone(const Double_t eta,const Double_t phi)const ; Bool_t AcceptConeDeviation(const TParticle *p)const ; Bool_t AcceptConeDeviation(const Double_t e,const Double_t eta,const Double_t phi)const ; @@ -60,7 +60,7 @@ public: else return fSumPhi/fSumEnergy ;} Int_t GetNJetParticles(void)const{return fNpart;} - void Print(Option_t * option="") ; + void Print() ; AliPHOSJet & operator = (const AliPHOSJet & rvalue) { // assignement operator requested by coding convention but not needed Fatal("operator =", "not implemented") ; return *this ; diff --git a/PHOS/AliPHOSJetFinder.cxx b/PHOS/AliPHOSJetFinder.cxx index 0506d28fb18..a09e1e0d7b0 100644 --- a/PHOS/AliPHOSJetFinder.cxx +++ b/PHOS/AliPHOSJetFinder.cxx @@ -227,7 +227,7 @@ void AliPHOSJetFinder::FindJetsFromDigits(const TClonesArray * digits, TObjArray if(iDigit!= ind){ //first digit already in jet digit = static_cast(copyDigits->At(iDigit)); CalculateEEtaPhi(digit,e,eta,phi) ; - if(jet->IsInCone(e,eta,phi) && //is cell in cone + if(jet->IsInCone(eta,phi) && //is cell in cone jet->AcceptConeDeviation(e,eta,phi)){//if cone does not move too much jet->AddDigit(e,eta,phi,-1) ; //accept new direction } @@ -238,7 +238,7 @@ void AliPHOSJetFinder::FindJetsFromDigits(const TClonesArray * digits, TObjArray //note, that digits might be returned as anused later for(Int_t icell = 0 ; icell < copyDigits->GetEntries() ; icell++){ digit = static_cast(copyDigits->At(icell)); - if(jet->IsInCone(e,eta,phi)){ //is cell in cone + if(jet->IsInCone(eta,phi)){ //is cell in cone CalculateEEtaPhi(digit,e,eta,phi) ; jet->AddDigit(e,eta,phi,digit->GetIndexInList()) ; } @@ -326,7 +326,7 @@ void AliPHOSJetFinder::CalculateEEtaPhi(const AliPHOSDigit * d,Double_t &e, Doub phi = pos.Phi() ; } //____________________________________________________________________________ -void AliPHOSJetFinder::Print(Option_t * option){ +void AliPHOSJetFinder::Print(){ //Print parameters of the found jet printf("\n --------------- AliPHOSJetFinder --------------- \n") ; printf(" Jets found .........%d \n",fNJets) ; diff --git a/PHOS/AliPHOSJetFinder.h b/PHOS/AliPHOSJetFinder.h index 8bccfa535b1..0027211569a 100644 --- a/PHOS/AliPHOSJetFinder.h +++ b/PHOS/AliPHOSJetFinder.h @@ -31,7 +31,7 @@ public: void FindJetsFromParticles(const TClonesArray * plist,TObjArray * jetslist) ; //Do the job void FindJetsFromDigits(const TClonesArray * digits,TObjArray * jetslist) ; //Do the job - void Print(Option_t * option = "") ; + void Print() ; void SetEtSeed(Double_t etseed){fEtSeed = etseed ;} ; void SetEtMin(Double_t etmin){fEtMin = etmin ;} ; diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 12c62c01e57..4858900bce4 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -36,14 +36,12 @@ class AliPHOSPID : public TTask { AliPHOSPID(const AliPHOSPID & pid) : TTask(pid) {;} virtual ~AliPHOSPID() ; // dtor - virtual void Exec(Option_t * option) { Warning("Exec", "not defined" ) ; } + virtual void Exec(Option_t *) = 0; virtual const Int_t GetRecParticlesInRun() const { Warning("GetRecParticlesInRun", "not defined" ) ; return 0 ;} virtual void Print() const { Warning("Print", "not defined" ) ;} - virtual void SetCpvtoEmcDistanceCut(Float_t Cluster_En, TString Eff_Pur,Float_t cut ) { Warning("SetCpvtoEmcDistanceCut", "not defined" ) ;} void SetEventFolderName(TString name) { fEventFolderName = name ; } - virtual void SetTimeGate(Float_t Cluster_En, TString Eff_Pur, Float_t gate) { Warning("SetTimeGate", "not defined" ) ; } virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } - virtual void WriteRecParticles(Int_t event) { Warning("WriteRecParticles", "not defined" ) ; } + virtual void WriteRecParticles() = 0; private: virtual void Init() { Warning("Init", "not defined" ) ; } diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx index 2c554e3fcfb..7e1b6afb5c0 100644 --- a/PHOS/AliPHOSPIDv1.cxx +++ b/PHOS/AliPHOSPIDv1.cxx @@ -201,7 +201,7 @@ void AliPHOSPIDv1::Exec(Option_t * option) if(gime->TrackSegments() && //Skip events, where no track segments made gime->TrackSegments()->GetEntriesFast()) { MakeRecParticles() ; - WriteRecParticles(ievent); + WriteRecParticles(); if(strstr(option,"deb")) PrintRecParticles(option) ; //increment the total number of rec particles per run @@ -857,7 +857,7 @@ void AliPHOSPIDv1::Unload() } //____________________________________________________________________________ -void AliPHOSPIDv1::WriteRecParticles(Int_t event) +void AliPHOSPIDv1::WriteRecParticles() { AliPHOSGetter *gime = AliPHOSGetter::Instance() ; diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h index 78c71c775b6..bd05c1cd70b 100644 --- a/PHOS/AliPHOSPIDv1.h +++ b/PHOS/AliPHOSPIDv1.h @@ -87,7 +87,7 @@ private: const Int_t GetHardPi0Bit (AliPHOSEmcRecPoint * emc) const; TVector3 GetMomentumDirection(AliPHOSEmcRecPoint * emc, AliPHOSRecPoint * cpv)const ; void PrintRecParticles(Option_t * option) ; - virtual void WriteRecParticles(Int_t event) ; + virtual void WriteRecParticles() ; void SetParameters() ; //Fills the matrix of parameters void Unload(); diff --git a/PHOS/AliPHOSQAObjectCheckable.h b/PHOS/AliPHOSQAObjectCheckable.h index 07425452b64..fd343aabada 100644 --- a/PHOS/AliPHOSQAObjectCheckable.h +++ b/PHOS/AliPHOSQAObjectCheckable.h @@ -36,7 +36,7 @@ public: virtual void Print() const ; virtual void Reset() { fChange=kFALSE ; } virtual void Set(TObject * obj) {fObject = obj ;} - virtual void Update(TObject * value) {} ; + virtual void Update() {} ; private: diff --git a/PHOS/AliPHOSRaw2Digits.cxx b/PHOS/AliPHOSRaw2Digits.cxx index b7dc922a675..95e0bd15c38 100644 --- a/PHOS/AliPHOSRaw2Digits.cxx +++ b/PHOS/AliPHOSRaw2Digits.cxx @@ -167,7 +167,7 @@ AliPHOSRaw2Digits::~AliPHOSRaw2Digits() } //____________________________________________________________________________ -void AliPHOSRaw2Digits::Exec(Option_t * option){ +void AliPHOSRaw2Digits::Exec(){ //This is steering method performing all the conversion if(!fIsInitialized) //need initialization @@ -634,7 +634,7 @@ void AliPHOSRaw2Digits::WriteDigits(void){ gAlice->TreeE()->Fill(); } //____________________________________________________________________________ -void AliPHOSRaw2Digits::Print(Option_t * option)const{ +void AliPHOSRaw2Digits::Print()const{ //prints current configuration and status. printf("----------AliPHOSRaw2Digits---------- \n") ; diff --git a/PHOS/AliPHOSRaw2Digits.h b/PHOS/AliPHOSRaw2Digits.h index 7b05e69193c..61a1d96c158 100644 --- a/PHOS/AliPHOSRaw2Digits.h +++ b/PHOS/AliPHOSRaw2Digits.h @@ -31,7 +31,7 @@ public: AliPHOSRaw2Digits(AliPHOSRaw2Digits & r2d) ; // cpy ctor virtual ~AliPHOSRaw2Digits() ; // dtor - void Exec(Option_t *option) ; + void Exec() ; void SetBeamEnergy(Float_t energy){fBeamEnergy = energy ;} void SetInputFile(TString inname="Run_1234.fz"){fInName=inname ; } @@ -46,7 +46,7 @@ public: {for(Int_t i=0;i<3;i++)fTarget[i]=pos[i] ;} void SetConTableDB(AliPHOSConTableDB * ctdb){fctdb = ctdb ;} void SetMaxEventsPerFile(Int_t nev=20000){fMaxPerFile = nev ;} - void Print(Option_t *option="")const ; + void Print()const ; AliPHOSRaw2Digits & operator = ( AliPHOSRaw2Digits & r2d ) { return *this ; } private: diff --git a/PHOS/AliPHOSRecCpvManager.cxx b/PHOS/AliPHOSRecCpvManager.cxx index 27e615c3b22..ae0595dd42d 100644 --- a/PHOS/AliPHOSRecCpvManager.cxx +++ b/PHOS/AliPHOSRecCpvManager.cxx @@ -63,7 +63,7 @@ AliPHOSRecCpvManager::~AliPHOSRecCpvManager(void) // Put a comment here } -Float_t AliPHOSRecCpvManager::Dispersion(Float_t etot, Float_t ai, Float_t ei) const +Float_t AliPHOSRecCpvManager::Dispersion(Float_t etot, Float_t ai) const { //"Dispresion" of energy deposition in the cell. // etot is the total shower energy, ai is the diff --git a/PHOS/AliPHOSRecCpvManager.h b/PHOS/AliPHOSRecCpvManager.h index a864f0354e6..f16504454be 100644 --- a/PHOS/AliPHOSRecCpvManager.h +++ b/PHOS/AliPHOSRecCpvManager.h @@ -20,7 +20,7 @@ class AliPHOSRecCpvManager : public AliPHOSRecManager { void AG(Float_t e, Float_t dx, Float_t dy, Float_t& a, Float_t& gradx, Float_t& grady ); - Float_t Dispersion(Float_t etot, Float_t ai, Float_t ei) const; + Float_t Dispersion(Float_t etot, Float_t ai) const; Float_t OneGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& gi) const ; Float_t TwoGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& gi) const ; diff --git a/PHOS/AliPHOSRecEmcManager.cxx b/PHOS/AliPHOSRecEmcManager.cxx index c6de4e503db..4348c8224dc 100644 --- a/PHOS/AliPHOSRecEmcManager.cxx +++ b/PHOS/AliPHOSRecEmcManager.cxx @@ -62,7 +62,7 @@ ClassImp(AliPHOSRecEmcManager) AliPHOSRecEmcManager::~AliPHOSRecEmcManager(void) {} -Float_t AliPHOSRecEmcManager::Dispersion(Float_t eTot, Float_t ai, Float_t ei) const +Float_t AliPHOSRecEmcManager::Dispersion(Float_t ei) const { //"Dispresion" of energy deposition in the cell. // eTot is the total shower energy, ai is the @@ -72,7 +72,7 @@ Float_t AliPHOSRecEmcManager::Dispersion(Float_t eTot, Float_t ai, Float_t ei) c return ei; } -Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const +Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi) const { // Chi2 used in OneGam (one-gamma fitting). // gi is d(Chi2)/d(ai). @@ -85,7 +85,7 @@ Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, F } -Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const +Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi) const { // calculates chi^2 Float_t da = ai - ei; diff --git a/PHOS/AliPHOSRecEmcManager.h b/PHOS/AliPHOSRecEmcManager.h index f2d6206a478..d5fdb79792d 100644 --- a/PHOS/AliPHOSRecEmcManager.h +++ b/PHOS/AliPHOSRecEmcManager.h @@ -20,10 +20,10 @@ class AliPHOSRecEmcManager : public AliPHOSRecManager { void AG(Float_t e, Float_t dx, Float_t dy, Float_t& a, Float_t& gradx, Float_t& grady ); - Float_t Dispersion(Float_t eTot, Float_t ai, Float_t ei) const; + Float_t Dispersion(Float_t ei) const; - Float_t OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi)const; - Float_t TwoGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi)const; + Float_t OneGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi)const; + Float_t TwoGamChi2(Float_t ai, Float_t ei, Float_t, Float_t& gi)const; Float_t OneGamChisqCut() const{ return fOneGamChisqCut; } Float_t OneGamInitialStep() const{ return fOneGamInitialStep; } diff --git a/PHOS/AliPHOSRecManager.h b/PHOS/AliPHOSRecManager.h index 80b10f3d04b..1d79743f596 100644 --- a/PHOS/AliPHOSRecManager.h +++ b/PHOS/AliPHOSRecManager.h @@ -21,10 +21,9 @@ class AliPHOSRecManager : public TNamed { virtual ~AliPHOSRecManager(void) {} virtual void AG(Float_t e, Float_t dx, Float_t dy, Float_t& A, Float_t& gradX, Float_t& gradY ) = 0; - virtual Float_t Dispersion(Float_t eTot, Float_t ai, Float_t ei) const = 0; - virtual Float_t OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const = 0 ; - virtual Float_t TwoGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const = 0; + virtual Float_t OneGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& gi) const = 0 ; + virtual Float_t TwoGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& gi) const = 0; virtual Float_t OneGamChisqCut()const = 0 ; virtual Float_t OneGamInitialStep() const = 0; diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx index 86855cd6084..b9f5c24c8ba 100644 --- a/PHOS/AliPHOSReconstructioner.cxx +++ b/PHOS/AliPHOSReconstructioner.cxx @@ -166,9 +166,9 @@ TTask("AliPHOSReconstructioner",evFoldName) fIsInitialized = kTRUE ; } //____________________________________________________________________________ -void AliPHOSReconstructioner::Exec(Option_t *option) +void AliPHOSReconstructioner::Exec(Option_t) { - //chesk, if the names of branches, which should be made conicide with already + //check, if the names of branches, which should be made conicide with already //existing if(!fIsInitialized) Init() ; @@ -212,7 +212,7 @@ AliPHOSReconstructioner::~AliPHOSReconstructioner() // Delete data members if any } -void AliPHOSReconstructioner::Print(Option_t * option)const { +void AliPHOSReconstructioner::Print()const { // Print reconstructioner data TString message ; diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h index 58d5cf8a875..c877845ea85 100644 --- a/PHOS/AliPHOSReconstructioner.h +++ b/PHOS/AliPHOSReconstructioner.h @@ -40,7 +40,7 @@ public: virtual ~AliPHOSReconstructioner() ; - virtual void Exec(Option_t * option) ; + virtual void Exec(Option_t) ; AliPHOSDigitizer * GetDigitizer() const { return fDigitizer ; } AliPHOSClusterizer * GetClusterizer()const { return fClusterizer ; } @@ -48,7 +48,7 @@ public: AliPHOSTrackSegmentMaker * GetTSMaker() const { return fTSMaker ; } AliPHOSSDigitizer * GetSDigitizer() const { return fSDigitizer ; } - void Print(Option_t * option)const ; + void Print()const ; // void SetBranchTitle(const char* branch,const char * title) ; // // Sets the branch titles to separate different reconstruction flows diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx index 3714274f416..f152009914c 100644 --- a/PHOS/AliPHOSTrackSegment.cxx +++ b/PHOS/AliPHOSTrackSegment.cxx @@ -74,7 +74,7 @@ void AliPHOSTrackSegment::Copy(TObject & obj) } //____________________________________________________________________________ -void AliPHOSTrackSegment::Print(Option_t * opt) const +void AliPHOSTrackSegment::Print(Option_t *) const { // Print all information on this track Segment diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h index 2f6e55c5666..aca3306289a 100644 --- a/PHOS/AliPHOSTrackSegment.h +++ b/PHOS/AliPHOSTrackSegment.h @@ -40,7 +40,7 @@ public: Int_t GetEmcIndex() const { return fEmcRecPoint ; } Int_t GetCpvIndex() const { return fPpsdUpRecPoint; } - virtual void Print(Option_t * option) const; + virtual void Print(Option_t *) const; void SetIndexInList(Int_t val){ fIndexInList = val ; } void SetCpvRecPoint(AliPHOSRecPoint * PpsdUpRecPoint ); //sets PPSD up Rec Point diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index d6159460b6d..1b8ef1b8e6a 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -35,14 +35,14 @@ public: AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : TTask(tsmaker) { ; } virtual ~ AliPHOSTrackSegmentMaker() ; - virtual void Exec(Option_t * option){Warning("Exec", "Not Defined" ) ; } + virtual void Exec(Option_t *) = 0; virtual const Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } virtual void Print()const {Warning("Print", "Not Defined" ) ; } void SetEventFolderName(TString name) { fEventFolderName = name ; } - virtual void WriteTrackSegments(Int_t event){Warning("WriteTrackSegments", "Not Defined" ) ; } + virtual void WriteTrackSegments() = 0; protected: TString fEventFolderName ; // event folder name diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 996a309d753..dde92cf0cc0 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -343,7 +343,7 @@ void AliPHOSTrackSegmentMakerv1::Exec(Option_t * option) MakePairs() ; } - WriteTrackSegments(ievent) ; + WriteTrackSegments() ; if(strstr(option,"deb")) PrintTrackSegments(option); @@ -389,7 +389,7 @@ void AliPHOSTrackSegmentMakerv1::Print()const } //____________________________________________________________________________ -void AliPHOSTrackSegmentMakerv1::WriteTrackSegments(Int_t event) +void AliPHOSTrackSegmentMakerv1::WriteTrackSegments() { // Writes found TrackSegments to TreeR. Creates branches // "PHOSTS" and "AliPHOSTrackSegmentMaker" with the same title. diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index 4fb0b075344..3a14fb81dc0 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -68,7 +68,7 @@ private: void Init() ; void InitParameters() ; void PrintTrackSegments(Option_t *option) ; - virtual void WriteTrackSegments(Int_t event) ; + virtual void WriteTrackSegments() ; private: diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index 97fd93fb165..de16fc74412 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -320,7 +320,7 @@ void AliPHOSv1::StepManager(void) moduleNumber--; TClonesArray *cpvDigits = new TClonesArray("AliPHOSCPVDigit",0); // array of digits for current hit - CPVDigitize(pmom,xyd,moduleNumber,cpvDigits); + CPVDigitize(pmom,xyd,cpvDigits); Float_t xmean = 0; Float_t zmean = 0; @@ -467,7 +467,7 @@ void AliPHOSv1::StepManager(void) } //____________________________________________________________________________ -void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, Int_t moduleNumber, TClonesArray *cpvDigits) +void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, TClonesArray *cpvDigits) { // ------------------------------------------------------------------------ // Digitize one CPV hit: diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index 3487d7da2bb..81289d61e14 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -49,7 +49,7 @@ public: return *this ; } - void CPVDigitize (TLorentzVector p, Float_t *xy, Int_t moduleNumber, TClonesArray *digits) ; + void CPVDigitize (TLorentzVector p, Float_t *xy, TClonesArray *digits) ; Float_t CPVPadResponseFunction(Float_t qhit, Float_t zg, Float_t xg) ; Double_t CPVCumulPadResponse(Double_t x, Double_t y) ; -- 2.39.3