From 9e5d206744cddf451f4a32a4928872ad2f52d2cc Mon Sep 17 00:00:00 2001 From: schutz Date: Tue, 28 Oct 2003 13:54:30 +0000 Subject: [PATCH] Compilation warnings fixed --- EMCAL/AliEMCALClusterizer.h | 26 ++++++++++++-------------- EMCAL/AliEMCALClusterizerv1.cxx | 18 ++++++++++-------- EMCAL/AliEMCALClusterizerv1.h | 9 +++++---- EMCAL/AliEMCALDigit.cxx | 2 +- EMCAL/AliEMCALDigitizer.cxx | 6 +++--- EMCAL/AliEMCALDigitizer.h | 4 ++-- EMCAL/AliEMCALFastRecParticle.cxx | 7 ++++--- EMCAL/AliEMCALFastRecParticle.h | 2 +- EMCAL/AliEMCALGeometry.h | 2 +- EMCAL/AliEMCALHadronCorrectionv0.cxx | 2 +- EMCAL/AliEMCALHadronCorrectionv1.cxx | 2 +- EMCAL/AliEMCALHit.cxx | 2 +- EMCAL/AliEMCALJetFinder.cxx | 4 ++-- EMCAL/AliEMCALJetFinderAlgoOmni.cxx | 6 ++++-- EMCAL/AliEMCALJetFinderInputPrep.cxx | 4 +++- EMCAL/AliEMCALPID.h | 10 +++++----- EMCAL/AliEMCALPIDv1.cxx | 6 +++--- EMCAL/AliEMCALPIDv1.h | 6 ++---- EMCAL/AliEMCALRecParticle.cxx | 3 ++- EMCAL/AliEMCALRecPoint.cxx | 6 +++--- EMCAL/AliEMCALRecPoint.h | 8 ++++---- EMCAL/AliEMCALSDigitizer.cxx | 4 ++-- EMCAL/AliEMCALSDigitizer.h | 2 +- EMCAL/AliEMCALTowerRecPoint.cxx | 4 ++-- EMCAL/AliEMCALTowerRecPoint.h | 6 +++--- EMCAL/AliEMCALTrackSegment.cxx | 3 ++- EMCAL/AliEMCALTrackSegmentMaker.h | 6 +++--- EMCAL/AliEMCALTrackSegmentMakerv1.cxx | 6 +++--- EMCAL/AliEMCALTrackSegmentMakerv1.h | 2 +- EMCAL/AliEMCALv0.h | 5 ----- 30 files changed, 87 insertions(+), 86 deletions(-) diff --git a/EMCAL/AliEMCALClusterizer.h b/EMCAL/AliEMCALClusterizer.h index e7299a8ca74..4d4e7070c85 100644 --- a/EMCAL/AliEMCALClusterizer.h +++ b/EMCAL/AliEMCALClusterizer.h @@ -40,21 +40,19 @@ public: virtual const char * GetDigitsBranch() const {Warning("GetDigitsBranch", "Not Defined") ; return 0 ; } virtual void MakeClusters() {Warning("MakeClusters", "Not Defined") ; } - virtual void Print(Option_t * option)const {Warning("Print", "Not Defined") ; } + virtual void Print(Option_t * /*option*/)const {Warning("Print", "Not Defined") ; } - virtual void SetECClusteringThreshold(Float_t cluth) {Warning("SetECClusteringThreshold", "Not Defined") ; } - virtual void SetECLocalMaxCut(Float_t cut) {Warning("SetECLocalMaxCut", "Not Defined") ; } - virtual void SetECLogWeight(Float_t w) {Warning("SetECLogWeight", "Not Defined") ; } - virtual void SetHCClusteringThreshold(Float_t cluth) {Warning("SetHCLogWeight", "Not Defined") ; } - virtual void SetHCLocalMaxCut(Float_t cut) {Warning("SetHCLogWeight", "Not Defined") ; } - virtual void SetHCLogWeight(Float_t w) {Warning("SetHCLogWeight", "Not Defined") ; } - virtual void SetTimeGate(Float_t gate) {Warning("SetTimeGate", "Not Defined") ; } - virtual void SetPREClusteringThreshold(Float_t cluth) {Warning("SetPREClusteringThreshold", "Not Defined") ; } - virtual void SetPRELocalMaxCut(Float_t cut) {Warning("SetPRELocalMaxCut", "Not Defined") ; } - virtual void SetPRELogWeight(Float_t w) {Warning("SetPRELogWeight", "Not Defined") ; } - virtual void SetDigitsBranch(const char * title) {Warning("SetDigitsBranch", "Not Defined") ; } - virtual void SetRecPointsBranch(const char *title) {Warning("SetRecPointsBranch", "Not Defined") ; } - virtual void SetUnfolding(Bool_t toUnfold ) {Warning("SetUnfolding", "Not Defined") ; } + virtual void SetECAClusteringThreshold(Float_t) = 0; + virtual void SetECALocalMaxCut(Float_t) = 0; + virtual void SetECALogWeight(Float_t) = 0; + virtual void SetHCAClusteringThreshold(Float_t) = 0; + virtual void SetHCALocalMaxCut(Float_t) = 0; + virtual void SetHCALogWeight(Float_t) = 0; + virtual void SetTimeGate(Float_t) = 0; + virtual void SetPREClusteringThreshold(Float_t) = 0; + virtual void SetPRELocalMaxCut(Float_t) = 0; + virtual void SetPRELogWeight(Float_t) = 0; + virtual void SetUnfolding(Bool_t) = 0; virtual const char * Version() const {Warning("Version", "Not Defined") ; return 0 ; } protected: diff --git a/EMCAL/AliEMCALClusterizerv1.cxx b/EMCAL/AliEMCALClusterizerv1.cxx index 8557f4754bd..b9d9deada46 100644 --- a/EMCAL/AliEMCALClusterizerv1.cxx +++ b/EMCAL/AliEMCALClusterizerv1.cxx @@ -149,7 +149,7 @@ void AliEMCALClusterizerv1::Exec(Option_t * option) if(fToUnfold) MakeUnfolding() ; - WriteRecPoints(ievent) ; + WriteRecPoints() ; if(strstr(option,"deb")) PrintRecPoints(option) ; @@ -379,7 +379,7 @@ void AliEMCALClusterizerv1::Unload() } //____________________________________________________________________________ -void AliEMCALClusterizerv1::WriteRecPoints(Int_t event) +void AliEMCALClusterizerv1::WriteRecPoints() { // Creates new branches with given title @@ -742,10 +742,10 @@ Double_t AliEMCALClusterizerv1::ShowerShape(Double_t r) } //____________________________________________________________________________ -void AliEMCALClusterizerv1::UnfoldCluster(AliEMCALTowerRecPoint * iniTower, - Int_t nMax, - AliEMCALDigit ** maxAt, - Float_t * maxAtEnergy) +void AliEMCALClusterizerv1::UnfoldCluster(AliEMCALTowerRecPoint * /*iniTower*/, + Int_t /*nMax*/, + AliEMCALDigit ** /*maxAt*/, + Float_t * /*maxAtEnergy*/) { // Performs the unfolding of a cluster with nMax overlapping showers @@ -754,7 +754,9 @@ void AliEMCALClusterizerv1::UnfoldCluster(AliEMCALTowerRecPoint * iniTower, } //_____________________________________________________________________________ -void AliEMCALClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Double_t & fret, Double_t * x, Int_t iflag) +void AliEMCALClusterizerv1::UnfoldingChiSquare(Int_t & /*nPar*/, Double_t * /*Grad*/, + Double_t & /*fret*/, + Double_t * /*x*/, Int_t /*iflag*/) { // Calculates the Chi square for the cluster unfolding minimization // Number of parameters, Gradient, Chi squared, parameters, what to do @@ -762,7 +764,7 @@ void AliEMCALClusterizerv1::UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Do ::Fatal("UnfoldingChiSquare","Unfolding not implemented") ; } //____________________________________________________________________________ -void AliEMCALClusterizerv1::Print(Option_t * option)const +void AliEMCALClusterizerv1::Print(Option_t * /*option*/)const { // Print clusterizer parameters diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h index 29adee0dca8..31e841a1213 100644 --- a/EMCAL/AliEMCALClusterizerv1.h +++ b/EMCAL/AliEMCALClusterizerv1.h @@ -86,7 +86,7 @@ public: protected: - void WriteRecPoints(Int_t event) ; + void WriteRecPoints() ; virtual void MakeClusters( ) ; private: @@ -100,9 +100,10 @@ private: void InitParameters() ; virtual void MakeUnfolding() ; - void UnfoldCluster(AliEMCALTowerRecPoint * iniEmc,Int_t Nmax, - AliEMCALDigit ** maxAt,Float_t * maxAtEnergy ) ; //Unfolds cluster using TMinuit package - void PrintRecPoints(Option_t * option) ; + void UnfoldCluster(AliEMCALTowerRecPoint * /*iniEmc*/, Int_t /*Nmax*/, + AliEMCALDigit ** /*maxAt*/, + Float_t * /*maxAtEnergy*/ ) ; //Unfolds cluster using TMinuit package + void PrintRecPoints(Option_t * /*option*/) ; private: diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx index d61b9fb7c28..af9fae846fb 100644 --- a/EMCAL/AliEMCALDigit.cxx +++ b/EMCAL/AliEMCALDigit.cxx @@ -92,7 +92,7 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn } //____________________________________________________________________________ -AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) +AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit) { // copy ctor diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx index 804d4756730..f5e6a138fa6 100644 --- a/EMCAL/AliEMCALDigitizer.cxx +++ b/EMCAL/AliEMCALDigitizer.cxx @@ -112,7 +112,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(const TString alirunFileName, const TString } //____________________________________________________________________________ -AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d) +AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d) : AliDigitizer(d) { // copyy ctor @@ -404,7 +404,7 @@ void AliEMCALDigitizer::Exec(Option_t *option) Digitize(ievent) ; //Add prepared SDigits to digits and add the noise - WriteDigits(ievent) ; + WriteDigits() ; if(strstr(option,"deb")) PrintDigits(option); @@ -653,7 +653,7 @@ void AliEMCALDigitizer::Unload() } //_________________________________________________________________________________________ -void AliEMCALDigitizer::WriteDigits(Int_t event) +void AliEMCALDigitizer::WriteDigits() { // Makes TreeD in the output file. diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h index 32fae09a8ce..c76b167c86a 100644 --- a/EMCAL/AliEMCALDigitizer.h +++ b/EMCAL/AliEMCALDigitizer.h @@ -72,8 +72,8 @@ private: void InitParameters() ; void PrintDigits(Option_t * option) ; void Unload() ; - void WriteDigits(Int_t evt) ; // Writes Digits for particular event - Float_t TimeOfNoise(void) ; // Calculate time signal generated by noise + void WriteDigits() ; // Writes Digits the current event + Float_t TimeOfNoise(void) ; // Calculate time signal generated by noise //Calculate the time of crossing of the threshold by front edge Float_t FrontEdgeTime(TClonesArray * ticks) ; diff --git a/EMCAL/AliEMCALFastRecParticle.cxx b/EMCAL/AliEMCALFastRecParticle.cxx index 560c97d4ee2..220d2dc6a64 100644 --- a/EMCAL/AliEMCALFastRecParticle.cxx +++ b/EMCAL/AliEMCALFastRecParticle.cxx @@ -41,7 +41,8 @@ AliEMCALFastRecParticle::AliEMCALFastRecParticle() : TParticle() } //____________________________________________________________________________ - AliEMCALFastRecParticle::AliEMCALFastRecParticle(const AliEMCALFastRecParticle & rp) +AliEMCALFastRecParticle::AliEMCALFastRecParticle(const AliEMCALFastRecParticle & rp) + : TParticle(rp) { // copy ctor @@ -125,7 +126,7 @@ Int_t AliEMCALFastRecParticle::DistancetoPrimitive(Int_t px, Int_t py) } //______________________________________________________________________________ -void AliEMCALFastRecParticle::ExecuteEvent(Int_t event, Int_t px, Int_t py) +void AliEMCALFastRecParticle::ExecuteEvent(Int_t event, Int_t /*px*/, Int_t /*py*/) { // Execute action corresponding to one event // This member function is called when a AliEMCALFastRecParticle is clicked with the locator @@ -259,7 +260,7 @@ void AliEMCALFastRecParticle::Paint(Option_t *) } //____________________________________________________________________________ -void AliEMCALFastRecParticle::Print(Option_t * opt)const +void AliEMCALFastRecParticle::Print(Option_t * /*opt*/)const { // Print the type, energy and momentum of the reconstructed particle diff --git a/EMCAL/AliEMCALFastRecParticle.h b/EMCAL/AliEMCALFastRecParticle.h index b8bbe997ada..5dba3e8d00b 100644 --- a/EMCAL/AliEMCALFastRecParticle.h +++ b/EMCAL/AliEMCALFastRecParticle.h @@ -39,7 +39,7 @@ class AliEMCALFastRecParticle : 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 /*index=0*/) const {return 0 ;} const Int_t GetType() const { // returns the type of the particle return fType ; diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h index 86f720fd279..d7c9f3303c5 100644 --- a/EMCAL/AliEMCALGeometry.h +++ b/EMCAL/AliEMCALGeometry.h @@ -47,7 +47,7 @@ public: const Bool_t AreInSameTower(Int_t id1, Int_t id2) const ; virtual void GetGlobal(const AliRecPoint *, TVector3 &, TMatrix &) const {} virtual void GetGlobal(const AliRecPoint *, TVector3 &) const {} - virtual Bool_t Impact(const TParticle * particle) const {return kTRUE;} + virtual Bool_t Impact(const TParticle *) const {return kTRUE;} // General Bool_t IsInitialized(void) const { return fgInit ; } // Return EMCA geometrical parameters diff --git a/EMCAL/AliEMCALHadronCorrectionv0.cxx b/EMCAL/AliEMCALHadronCorrectionv0.cxx index eea01210458..6571b1c5ab0 100644 --- a/EMCAL/AliEMCALHadronCorrectionv0.cxx +++ b/EMCAL/AliEMCALHadronCorrectionv0.cxx @@ -52,7 +52,7 @@ AliEMCALHadronCorrectionv0::Instance() } Double_t -AliEMCALHadronCorrectionv0::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t gid) +AliEMCALHadronCorrectionv0::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t /*gid*/) { Int_t iEta=0; // index Double_t etaw = TMath::Abs(eta); diff --git a/EMCAL/AliEMCALHadronCorrectionv1.cxx b/EMCAL/AliEMCALHadronCorrectionv1.cxx index d5cafcd2084..d796fd335e4 100755 --- a/EMCAL/AliEMCALHadronCorrectionv1.cxx +++ b/EMCAL/AliEMCALHadronCorrectionv1.cxx @@ -110,7 +110,7 @@ AliEMCALHadronCorrectionv1::Instance() } Double_t -AliEMCALHadronCorrectionv1::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t gid) +AliEMCALHadronCorrectionv1::GetEnergy(const Double_t pmom,const Double_t eta,const Int_t /*gid*/) { Double_t etai = TMath::Abs(eta); Double_t value = fPar[5]*pmom*pmom*pmom+ fPar[0]*pmom*pmom+fPar[1]*pmom +fPar[2]*pmom*etai +fPar[3]*etai + fPar[4]; diff --git a/EMCAL/AliEMCALHit.cxx b/EMCAL/AliEMCALHit.cxx index 027fd11e010..dec3473d8d7 100644 --- a/EMCAL/AliEMCALHit.cxx +++ b/EMCAL/AliEMCALHit.cxx @@ -61,7 +61,7 @@ AliEMCALHit::AliEMCALHit(){ fIenergy = 0.0; } //______________________________________________________________________ -AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit){ +AliEMCALHit::AliEMCALHit(const AliEMCALHit & hit) : AliHit(hit){ // copy ctor fId = hit.fId ; diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx index eab4ee982b7..8c8a1f39fc3 100644 --- a/EMCAL/AliEMCALJetFinder.cxx +++ b/EMCAL/AliEMCALJetFinder.cxx @@ -375,7 +375,7 @@ Float_t AliEMCALJetFinder::HCConeEnergy(Float_t eta, Float_t phi) //} //return newenergy; -return 0.0; +return eta*phi*0.0; } @@ -1659,7 +1659,7 @@ Float_t AliEMCALJetFinder::PropagatePhi(Float_t pt, Float_t charge, Bool_t& curl return dPhi; } -void hf1(Int_t& id, Float_t& x, Float_t& wgt) +void hf1(Int_t& , Float_t& , Float_t& ) { // dummy for hbook calls ; diff --git a/EMCAL/AliEMCALJetFinderAlgoOmni.cxx b/EMCAL/AliEMCALJetFinderAlgoOmni.cxx index 763d5759ea0..5e5c21e847c 100644 --- a/EMCAL/AliEMCALJetFinderAlgoOmni.cxx +++ b/EMCAL/AliEMCALJetFinderAlgoOmni.cxx @@ -20,6 +20,9 @@ /* $Log$ +Revision 1.5 2003/09/23 13:31:41 mhorner +Changed coordinate system + Revision 1.4 2003/09/19 13:16:20 mhorner Added additional jet energy info @@ -145,8 +148,7 @@ if (fDebug>0) Info("AliEMCALJetFinderAlgoOmni","Beginning Default Constructor"); void AliEMCALJetFinderAlgoOmni::FillUnitArray(AliEMCALJetFinderAlgoUA1FillUnitFlagType_t flag) { if (fDebug>1) Info("FillUnitArray","Beginning FillUnitArray"); - AliEMCAL* pEMCAL = (AliEMCAL*) gAlice->GetModule("EMCAL"); - + // AliEMCAL* pEMCAL = (AliEMCAL*) gAlice->GetModule("EMCAL"); // if (pEMCAL){ // AliEMCALGeometry* geom = AliEMCALGeometry::GetInstance(pEMCAL->GetTitle(), ""); // }else diff --git a/EMCAL/AliEMCALJetFinderInputPrep.cxx b/EMCAL/AliEMCALJetFinderInputPrep.cxx index 4a4df09ab83..1bc25103392 100755 --- a/EMCAL/AliEMCALJetFinderInputPrep.cxx +++ b/EMCAL/AliEMCALJetFinderInputPrep.cxx @@ -48,7 +48,9 @@ AliEMCALJetFinderInputPrep::~AliEMCALJetFinderInputPrep() } -Int_t AliEMCALJetFinderInputPrep::FillFromFile(TString * filename,AliEMCALJetFinderFileType_t fileType, Int_t EventNumber) +Int_t AliEMCALJetFinderInputPrep::FillFromFile(TString * /*filename*/, + AliEMCALJetFinderFileType_t /*fileType*/, + Int_t /*EventNumber*/) { return 0; } diff --git a/EMCAL/AliEMCALPID.h b/EMCAL/AliEMCALPID.h index 5237d1edb1d..b215acbcb0b 100644 --- a/EMCAL/AliEMCALPID.h +++ b/EMCAL/AliEMCALPID.h @@ -36,14 +36,14 @@ class AliEMCALPID : public TTask { AliEMCALPID(const AliEMCALPID & pid):TTask(pid) {;} virtual ~AliEMCALPID() ; // 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(Option_t * option) const { Warning("Print", "not defined" ) ;} + virtual void Print(Option_t *) = 0; void SetEventFolderName(TString name) { fEventFolderName = name ; } - virtual void SetPREtoECADistanceCut(Float_t Cluster_En, TString Eff_Pur,Float_t cut ) { Warning("SetCpvtoEmcDistanceCut", "not defined" ) ;} - virtual void SetTimeGate(Float_t Cluster_En, TString Eff_Pur, Float_t gate) { Warning("SetTimeGate", "not defined" ) ; } + virtual void SetPREtoECADistanceCut(Float_t, TString, Float_t) { Warning("SetCpvtoEmcDistanceCut", "not defined" ) ;} + virtual void SetTimeGate(Float_t /*Cluster_En*/, TString /*Eff_Pur*/, Float_t /*gate*/) { Warning("SetTimeGate", "not defined" ) ; } virtual 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/EMCAL/AliEMCALPIDv1.cxx b/EMCAL/AliEMCALPIDv1.cxx index 0cb24a25f2b..848c3086521 100644 --- a/EMCAL/AliEMCALPIDv1.cxx +++ b/EMCAL/AliEMCALPIDv1.cxx @@ -136,7 +136,7 @@ void AliEMCALPIDv1::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 @@ -239,7 +239,7 @@ void AliEMCALPIDv1::MakeRecParticles(){ } //____________________________________________________________________________ -void AliEMCALPIDv1:: Print() +void AliEMCALPIDv1:: Print(Option_t * /*option*/) const { // Print the parameters used for the particle type identification @@ -292,7 +292,7 @@ void AliEMCALPIDv1::Unload() } //____________________________________________________________________________ -void AliEMCALPIDv1::WriteRecParticles(Int_t event) +void AliEMCALPIDv1::WriteRecParticles() { AliEMCALGetter *gime = AliEMCALGetter::Instance() ; diff --git a/EMCAL/AliEMCALPIDv1.h b/EMCAL/AliEMCALPIDv1.h index 6859f1d2540..3d95e007f1a 100644 --- a/EMCAL/AliEMCALPIDv1.h +++ b/EMCAL/AliEMCALPIDv1.h @@ -40,9 +40,7 @@ class AliEMCALPIDv1 : public AliEMCALPID { virtual const Int_t GetRecParticlesInRun() const {return fRecParticlesInRun ;} - virtual void Print(Option_t * option) const {} - void Print() ; - + virtual void Print(Option_t * option) const ; //To turn on or off the Pi0 analysis const Bool_t GetPi0Analysis(){return fPi0Analysis;} @@ -57,7 +55,7 @@ class AliEMCALPIDv1 : public AliEMCALPID { virtual void InitParameters() ; void MakeRecParticles(void ) ; void PrintRecParticles(Option_t * option) ; - virtual void WriteRecParticles(Int_t event) ; + virtual void WriteRecParticles() ; void Unload(); private: diff --git a/EMCAL/AliEMCALRecParticle.cxx b/EMCAL/AliEMCALRecParticle.cxx index c101bad46b9..173ceeac725 100644 --- a/EMCAL/AliEMCALRecParticle.cxx +++ b/EMCAL/AliEMCALRecParticle.cxx @@ -37,7 +37,8 @@ ClassImp(AliEMCALRecParticle) //____________________________________________________________________________ - AliEMCALRecParticle::AliEMCALRecParticle(const AliEMCALRecParticle & rp) +AliEMCALRecParticle::AliEMCALRecParticle(const AliEMCALRecParticle & rp) + : AliEMCALFastRecParticle(rp) { // copy ctor diff --git a/EMCAL/AliEMCALRecPoint.cxx b/EMCAL/AliEMCALRecPoint.cxx index 88ef2a9052d..40fa9fd69f0 100644 --- a/EMCAL/AliEMCALRecPoint.cxx +++ b/EMCAL/AliEMCALRecPoint.cxx @@ -88,7 +88,7 @@ Int_t AliEMCALRecPoint::DistancetoPrimitive(Int_t px, Int_t py) } //______________________________________________________________________________ -void AliEMCALRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) +void AliEMCALRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) { // Execute action corresponding to one event // This member function is called when a AliEMCALRecPoint is clicked with the locator @@ -145,7 +145,7 @@ void AliEMCALRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) clustertext ->Draw(""); } gPad->Update() ; - Print() ; + Print("") ; delete[] xi ; delete[] zi ; } @@ -167,7 +167,7 @@ break; } } //____________________________________________________________________________ -void AliEMCALRecPoint::EvalAll(Float_t logWeight,TClonesArray * digits) +void AliEMCALRecPoint::EvalAll(Float_t /*logWeight*/,TClonesArray * digits) { //evaluates (if necessary) all RecPoint data members diff --git a/EMCAL/AliEMCALRecPoint.h b/EMCAL/AliEMCALRecPoint.h index 8de62ef3116..0d44c110539 100644 --- a/EMCAL/AliEMCALRecPoint.h +++ b/EMCAL/AliEMCALRecPoint.h @@ -47,12 +47,12 @@ class AliEMCALRecPoint : public AliRecPoint { virtual Int_t Compare(const TObject * obj) const = 0 ; virtual Int_t DistancetoPrimitive(Int_t px, Int_t py); virtual void Draw(Option_t * option="") ; - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) ; - virtual void EvalAll(Float_t logWeight,TClonesArray * digits) ; + virtual void ExecuteEvent(Int_t event, Int_t, Int_t) ; + virtual void EvalAll(Float_t /*logWeight*/,TClonesArray * digits) ; virtual void EvalEMCALArm(AliEMCALDigit * digit) ; virtual void EvalPrimaries(TClonesArray * digits) ; virtual Int_t GetEMCALArm(void) const {return fEMCALArm ; } - virtual void GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const {;} // return global position in ALICE + virtual void GetGlobalPosition(TVector3 & /*gpos*/, TMatrix & /*gmat*/) const {;} // return global position in ALICE virtual void GetGlobalPosition(TVector3 & gpos) const ; // return global position (r, theta, phi) in ALICE virtual void GetLocalPosition(TVector3 & lpos) const ; // return loca position (x, y, z) in EMCAL // virtual Int_t GetEMCALMod(void) const {return fEMCALMod ; } @@ -67,7 +67,7 @@ class AliEMCALRecPoint : public AliRecPoint { return kTRUE ; } virtual void Paint(Option_t * option=""); - virtual void Print(Option_t * opt = "void") const { + virtual void Print(Option_t * /*opt = "void"*/) const { // Print prototype } diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx index 7652203ee53..1524d702360 100644 --- a/EMCAL/AliEMCALSDigitizer.cxx +++ b/EMCAL/AliEMCALSDigitizer.cxx @@ -86,7 +86,7 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, const char * //____________________________________________________________________________ -AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) { +AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) : TTask(sd) { //cpy ctor fA = sd.fA ; @@ -301,7 +301,7 @@ void AliEMCALSDigitizer::Exec(Option_t *option) //__________________________________________________________________ -void AliEMCALSDigitizer::Print(Option_t* option)const +void AliEMCALSDigitizer::Print(Option_t*)const { // Prints parameters of SDigitizer Info("Print", "\n------------------- %s -------------", GetName() ) ; diff --git a/EMCAL/AliEMCALSDigitizer.h b/EMCAL/AliEMCALSDigitizer.h index 0c4b1c32048..d3b825ee6ec 100644 --- a/EMCAL/AliEMCALSDigitizer.h +++ b/EMCAL/AliEMCALSDigitizer.h @@ -35,7 +35,7 @@ public: Int_t Digitize(Float_t Energy)const { return (Int_t ) ( fA + Energy*fB); } virtual void Exec(Option_t *option); Int_t GetSDigitsInRun() const {return fSDigitsInRun ;} - virtual void Print(Option_t* option) const ; + virtual void Print(Option_t*) const ; void SetEventFolderName(TString name) { fEventFolderName = name ; } Bool_t operator == (const AliEMCALSDigitizer & sd) const ; diff --git a/EMCAL/AliEMCALTowerRecPoint.cxx b/EMCAL/AliEMCALTowerRecPoint.cxx index 47e1ea9f580..8c711c59cc4 100644 --- a/EMCAL/AliEMCALTowerRecPoint.cxx +++ b/EMCAL/AliEMCALTowerRecPoint.cxx @@ -184,7 +184,7 @@ Int_t AliEMCALTowerRecPoint::Compare(const TObject * obj) const return rv ; } //______________________________________________________________________________ -void AliEMCALTowerRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) const +void AliEMCALTowerRecPoint::ExecuteEvent(Int_t /*event*/, Int_t, Int_t) const { // Execute action corresponding to one event @@ -679,7 +679,7 @@ void AliEMCALTowerRecPoint::EvalTime(TClonesArray * digits){ } //____________________________________________________________________________ -void AliEMCALTowerRecPoint::Print(Option_t * option) +void AliEMCALTowerRecPoint::Print(Option_t *) { // Print the list of digits belonging to the cluster diff --git a/EMCAL/AliEMCALTowerRecPoint.h b/EMCAL/AliEMCALTowerRecPoint.h index d7233104244..d811ba5dd57 100644 --- a/EMCAL/AliEMCALTowerRecPoint.h +++ b/EMCAL/AliEMCALTowerRecPoint.h @@ -44,7 +44,7 @@ public: virtual void EvalAll(Float_t logWeight,TClonesArray * digits) ; virtual void EvalGlobalPosition(Float_t logWeight, TClonesArray * digits) ; - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const; + virtual void ExecuteEvent(Int_t /*event*/, Int_t, Int_t) const; Float_t GetCoreEnergy()const {return fCoreEnergy ;} virtual Float_t GetDispersion()const {return fDispersion ;} @@ -61,7 +61,7 @@ public: // searches for the local maxima Float_t GetTime(void) const{return fTime ; } Bool_t IsSortable() const {return kTRUE ; } // says that emcrecpoints are sortable objects - void Print(Option_t * opt = "void") ; + void Print(Option_t * /*opt = "void"*/) ; const TVector3 XYZInAlice(Float_t r = 9999., Float_t theta = 9999., Float_t phi = 9999.) const ; AliEMCALTowerRecPoint & operator = (const AliEMCALTowerRecPoint & rvalue) { @@ -72,7 +72,7 @@ public: protected: void EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ; - virtual void EvalLocalPosition(Float_t logWeight,TClonesArray * digits) {;}// computes the position in the EMCAL module + virtual void EvalLocalPosition(Float_t /*logWeight*/,TClonesArray * /*digits*/) {;}// computes the position in the EMCAL module virtual void EvalDispersion(Float_t logWeight,TClonesArray * digits) ; // computes the dispersion of the shower virtual void EvalElipsAxis(Float_t logWeight, TClonesArray * digits ); // computes the axis of shower ellipsoide void EvalTime( TClonesArray * digits ); diff --git a/EMCAL/AliEMCALTrackSegment.cxx b/EMCAL/AliEMCALTrackSegment.cxx index c04e98d1e6e..c51fc55cc87 100644 --- a/EMCAL/AliEMCALTrackSegment.cxx +++ b/EMCAL/AliEMCALTrackSegment.cxx @@ -58,6 +58,7 @@ AliEMCALTrackSegment::AliEMCALTrackSegment( AliEMCALTowerRecPoint * eca, AliEMCA //____________________________________________________________________________ AliEMCALTrackSegment::AliEMCALTrackSegment( const AliEMCALTrackSegment & ts) + : TObject(ts) { // Copy ctor @@ -78,7 +79,7 @@ void AliEMCALTrackSegment::Copy(TObject & obj) } //____________________________________________________________________________ -void AliEMCALTrackSegment::Print(Option_t * opt) const +void AliEMCALTrackSegment::Print(Option_t *) const { // Print all information on this track Segment diff --git a/EMCAL/AliEMCALTrackSegmentMaker.h b/EMCAL/AliEMCALTrackSegmentMaker.h index 9428f019902..af19f53f949 100644 --- a/EMCAL/AliEMCALTrackSegmentMaker.h +++ b/EMCAL/AliEMCALTrackSegmentMaker.h @@ -33,12 +33,12 @@ public: AliEMCALTrackSegmentMaker(const AliEMCALTrackSegmentMaker & tsmaker):TTask(tsmaker) { ; } virtual ~ AliEMCALTrackSegmentMaker() ; - 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(Option_t * option)const {Warning("Print", "Not Defined" ) ; } + virtual void Print(Option_t *) = 0; virtual const char * Version() const {Warning("Version", "Not Defined" ) ; return 0 ; } - virtual void WriteTrackSegments(Int_t event){Warning("WriteTrackSegments", "Not Defined" ) ; } + virtual void WriteTrackSegments() = 0; protected: TString fEventFolderName ; // event folder name diff --git a/EMCAL/AliEMCALTrackSegmentMakerv1.cxx b/EMCAL/AliEMCALTrackSegmentMakerv1.cxx index c437b081c09..3a1df1fa31b 100644 --- a/EMCAL/AliEMCALTrackSegmentMakerv1.cxx +++ b/EMCAL/AliEMCALTrackSegmentMakerv1.cxx @@ -353,7 +353,7 @@ void AliEMCALTrackSegmentMakerv1::Exec(Option_t * option) MakeLinks() ; MakePairs() ; - WriteTrackSegments(ievent) ; + WriteTrackSegments() ; if(strstr(option,"deb")) PrintTrackSegments(option) ; @@ -380,7 +380,7 @@ void AliEMCALTrackSegmentMakerv1::Unload() } //____________________________________________________________________________ -void AliEMCALTrackSegmentMakerv1::Print(Option_t * option)const +void AliEMCALTrackSegmentMakerv1::Print(Option_t * /*option*/)const { // Print TrackSegmentMaker parameters @@ -395,7 +395,7 @@ void AliEMCALTrackSegmentMakerv1::Print(Option_t * option)const } //____________________________________________________________________________ -void AliEMCALTrackSegmentMakerv1::WriteTrackSegments(Int_t event) +void AliEMCALTrackSegmentMakerv1::WriteTrackSegments() { // Writes found TrackSegments to TreeR. Creates branches // "EMCALTS" and "AliEMCALTrackSegmentMaker" with the same title. diff --git a/EMCAL/AliEMCALTrackSegmentMakerv1.h b/EMCAL/AliEMCALTrackSegmentMakerv1.h index db3453c8460..1ebbf2488b9 100644 --- a/EMCAL/AliEMCALTrackSegmentMakerv1.h +++ b/EMCAL/AliEMCALTrackSegmentMakerv1.h @@ -58,7 +58,7 @@ private: void InitParameters() ; void PrintTrackSegments(Option_t *option) ; void Unload() ; - virtual void WriteTrackSegments(Int_t event) ; + virtual void WriteTrackSegments() ; private: diff --git a/EMCAL/AliEMCALv0.h b/EMCAL/AliEMCALv0.h index 239571a19f0..1eaa467751b 100644 --- a/EMCAL/AliEMCALv0.h +++ b/EMCAL/AliEMCALv0.h @@ -34,11 +34,6 @@ class AliEMCALv0 : public AliEMCAL { } virtual ~AliEMCALv0(){} - virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, - Int_t id, Float_t *hits ) { - // no hits - useless - } - virtual void BuildGeometry();// creates the geometry for the ROOT display virtual void CreateGeometry() ;// creates the geometry for GEANT virtual void Init(void) ; // does nothing -- 2.43.0