From a8c47ab60ad997f04fe8b6319252c3e891625397 Mon Sep 17 00:00:00 2001 From: schutz Date: Wed, 3 Sep 2003 18:14:40 +0000 Subject: [PATCH] Compilation warnings fixed --- PHOS/AliPHOS.h | 2 +- PHOS/AliPHOSAnalyze.cxx | 1 + PHOS/AliPHOSCalibrManager.h | 2 +- PHOS/AliPHOSCalibrationData.cxx | 1 + PHOS/AliPHOSCalibrator.h | 2 +- PHOS/AliPHOSClusterizer.h | 22 +++++++++------------- PHOS/AliPHOSClusterizerv1.h | 2 +- PHOS/AliPHOSCpvRecPoint.cxx | 2 +- PHOS/AliPHOSCpvRecPoint.h | 4 ++-- PHOS/AliPHOSDigit.cxx | 4 ++-- PHOS/AliPHOSDigit.h | 2 +- PHOS/AliPHOSDigitizer.cxx | 1 + PHOS/AliPHOSEMCAGeometry.h | 10 +++++----- PHOS/AliPHOSEmcRecPoint.cxx | 2 +- PHOS/AliPHOSEmcRecPoint.h | 2 +- PHOS/AliPHOSFastRecParticle.cxx | 1 + PHOS/AliPHOSGeometry.cxx | 9 +++++---- PHOS/AliPHOSGeometry.h | 2 +- PHOS/AliPHOSGetter.h | 2 +- PHOS/AliPHOSHit.cxx | 2 +- PHOS/AliPHOSImpact.cxx | 1 + PHOS/AliPHOSJet.h | 2 +- PHOS/AliPHOSJetFinder.h | 2 +- PHOS/AliPHOSLoader.h | 2 +- PHOS/AliPHOSPID.h | 2 +- PHOS/AliPHOSQAChecker.h | 2 +- PHOS/AliPHOSQAFloatCheckable.h | 3 ++- PHOS/AliPHOSQAIntCheckable.h | 3 ++- PHOS/AliPHOSQAObjectCheckable.h | 3 ++- PHOS/AliPHOSQAVirtualCheckable.h | 2 +- PHOS/AliPHOSRecParticle.cxx | 1 + PHOS/AliPHOSRecPoint.cxx | 4 ++-- PHOS/AliPHOSRecPoint.h | 6 +++--- PHOS/AliPHOSReconstructioner.h | 2 +- PHOS/AliPHOSSDigitizer.cxx | 4 +++- PHOS/AliPHOSSupportGeometry.h | 10 +++++----- PHOS/AliPHOSTrackSegment.cxx | 1 + PHOS/AliPHOSTrackSegmentMaker.h | 2 +- PHOS/AliPHOSTrackSegmentMakerv1.h | 2 +- PHOS/AliPHOSv0.cxx | 6 +++--- PHOS/AliPHOSv0.h | 5 +++-- PHOS/AliPHOSv1.h | 2 +- PHOS/AliPHOSvFast.cxx | 4 ++-- PHOS/AliPHOSvFast.h | 6 +----- PHOS/AliPHOSvImpacts.h | 2 +- 45 files changed, 80 insertions(+), 74 deletions(-) diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h index a4b786d8188..9f065077d2d 100644 --- a/PHOS/AliPHOS.h +++ b/PHOS/AliPHOS.h @@ -29,7 +29,7 @@ class AliPHOS : public AliDetector { AliPHOS() ; AliPHOS(const char* name, const char* title="") ; - AliPHOS(const AliPHOS & phos) { + AliPHOS(const AliPHOS & phos) : AliDetector(phos) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSAnalyze.cxx b/PHOS/AliPHOSAnalyze.cxx index 1f6e1db41b5..b94966759bb 100644 --- a/PHOS/AliPHOSAnalyze.cxx +++ b/PHOS/AliPHOSAnalyze.cxx @@ -115,6 +115,7 @@ AliPHOSAnalyze::AliPHOSAnalyze(Text_t * fileName) //____________________________________________________________________________ AliPHOSAnalyze::AliPHOSAnalyze(const AliPHOSAnalyze & ana) + : TObject(ana) { // copy ctor ( (AliPHOSAnalyze &)ana ).Copy(*this) ; diff --git a/PHOS/AliPHOSCalibrManager.h b/PHOS/AliPHOSCalibrManager.h index 880f922dd33..2ba34e9556b 100644 --- a/PHOS/AliPHOSCalibrManager.h +++ b/PHOS/AliPHOSCalibrManager.h @@ -24,7 +24,7 @@ class AliPHOSCalibrManager:public TNamed { public: AliPHOSCalibrManager() ; // ctor - AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) { + AliPHOSCalibrManager(const AliPHOSCalibrManager & manager) : TNamed(manager) { // cpy ctor: no need // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSCalibrationData.cxx b/PHOS/AliPHOSCalibrationData.cxx index 685cd7c00d8..35271b1c961 100644 --- a/PHOS/AliPHOSCalibrationData.cxx +++ b/PHOS/AliPHOSCalibrationData.cxx @@ -59,6 +59,7 @@ ClassImp(AliPHOSCalibrationData) } //____________________________________________________________________________ AliPHOSCalibrationData::AliPHOSCalibrationData(const AliPHOSCalibrationData & cd) + : TObject(cd) { //copy ctor fData = new TArrayF(*cd.fData) ; diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h index a3c1218be9d..ec0e26686ba 100644 --- a/PHOS/AliPHOSCalibrator.h +++ b/PHOS/AliPHOSCalibrator.h @@ -26,7 +26,7 @@ class AliPHOSCalibrator: public TTask{ public: AliPHOSCalibrator() ; // ctor AliPHOSCalibrator(const char* run, const char * title = "Default") ; - AliPHOSCalibrator(const AliPHOSCalibrator & ctor) { + AliPHOSCalibrator(const AliPHOSCalibrator & ctor) : TTask(ctor) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h index 2f8ff1b8779..21c96610af8 100644 --- a/PHOS/AliPHOSClusterizer.h +++ b/PHOS/AliPHOSClusterizer.h @@ -25,7 +25,7 @@ public: AliPHOSClusterizer() ; // default ctor AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; - AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer) { ; } + AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer) : TTask(clusterizer) { ; } virtual ~AliPHOSClusterizer() ; // dtor virtual Float_t GetEmcClusteringThreshold()const {Warning("GetEmcClusteringThreshold", "Not Defined" ) ; return 0. ; } virtual Float_t GetEmcLocalMaxCut()const {Warning("GetEmcLocalMaxCut", "Not Defined" ) ; return 0. ; } @@ -34,24 +34,20 @@ public: virtual Float_t GetCpvClusteringThreshold()const {Warning("GetCpvClusteringThreshold", "Not Defined" ) ; return 0. ; } virtual Float_t GetCpvLocalMaxCut()const {Warning("GetCpvLocalMaxCut", "Not Defined" ) ; return 0. ; } virtual Float_t GetCpvLogWeight()const {Warning("GetCpvLogWeight", "Not Defined" ) ; return 0. ; } - virtual const char * GetRecPointsBranch() const {Warning("GetRecPointsBranch", "Not Defined" ) ; return 0 ; } ; virtual const Int_t GetRecPointsInRun() const {Warning("GetRecPointsInRun", "Not Defined" ) ; return 0 ; } - virtual const char * GetDigitsBranch() const{Warning("GetDigitsBranch", "Not Defined" ) ; return 0 ; } ; virtual void MakeClusters() {Warning("MakeClusters", "Not Defined" ) ; } virtual void Print()const {Warning("Print", "Not Defined" ) ; } - virtual void SetEmcClusteringThreshold(Float_t cluth) {Warning("SetEmcClusteringThreshold", "Not Defined" ) ; } - virtual void SetEmcLocalMaxCut(Float_t cut) {Warning("SetEmcLocalMaxCut", "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 SetEmcLogWeight(Float_t w) {Warning("SetEmcLogWeight", "Not Defined" ) ; } - virtual void SetEmcTimeGate(Float_t gate) {Warning("SetEmcTimeGate", "Not Defined" ) ; } - virtual void SetCpvClusteringThreshold(Float_t cluth) {Warning("SetCpvClusteringThreshold", "Not Defined" ) ; } - virtual void SetCpvLocalMaxCut(Float_t cut) {Warning("SetCpvLocalMaxCut", "Not Defined" ) ; } - virtual void SetCpvLogWeight(Float_t w) {Warning("SetCpvLogWeight", "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 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" ) ;} void SetEventFolderName(TString name) { fEventFolderName = name ; } AliPHOSClusterizer & operator = (const AliPHOSClusterizer & rvalue) {return *this ;} diff --git a/PHOS/AliPHOSClusterizerv1.h b/PHOS/AliPHOSClusterizerv1.h index caf6f5024f5..893e3d41a99 100644 --- a/PHOS/AliPHOSClusterizerv1.h +++ b/PHOS/AliPHOSClusterizerv1.h @@ -33,7 +33,7 @@ public: AliPHOSClusterizerv1() ; AliPHOSClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); - AliPHOSClusterizerv1(const AliPHOSClusterizerv1 & clu) { + AliPHOSClusterizerv1(const AliPHOSClusterizerv1 & clu) : AliPHOSClusterizer(clu) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx index 3d37dafc3ba..26b1500461d 100644 --- a/PHOS/AliPHOSCpvRecPoint.cxx +++ b/PHOS/AliPHOSCpvRecPoint.cxx @@ -340,7 +340,7 @@ void AliPHOSCpvRecPoint::EvalClusterLengths(TClonesArray * digits) //____________________________________________________________________________ -void AliPHOSCpvRecPoint::Print(Option_t * option) +void AliPHOSCpvRecPoint::Print(Option_t *) { // Print the list of digits belonging to the cluster diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h index 2b14c918283..0a102d6c046 100644 --- a/PHOS/AliPHOSCpvRecPoint.h +++ b/PHOS/AliPHOSCpvRecPoint.h @@ -30,7 +30,7 @@ public: AliPHOSCpvRecPoint() ; AliPHOSCpvRecPoint(const char * opt) ; - AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) { + AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) : AliPHOSEmcRecPoint(rp) { // cpy ctor requested by Coding Convention // but not yet needed assert(0==1) ; @@ -49,7 +49,7 @@ public: Bool_t IsEmc(void) const {return kFALSE ; } // tells that this is not a EMC Bool_t IsCPV(void) const {return kTRUE ; } // true if the recpoint is in CPV Bool_t IsSortable() const { return kTRUE ; } // tells that this is a sortable object - void Print(Option_t * opt = "void") ; + void Print(Option_t *) ; AliPHOSCpvRecPoint & operator = (const AliPHOSCpvRecPoint & rvalue) { // assignement operator requested by coding convention but not needed diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index 75872cff095..a374834c68b 100644 --- a/PHOS/AliPHOSDigit.cxx +++ b/PHOS/AliPHOSDigit.cxx @@ -70,7 +70,7 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim } //____________________________________________________________________________ -AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) +AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit) { // copy ctor @@ -132,7 +132,7 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const } //____________________________________________________________________________ -void AliPHOSDigit::Print(Option_t *option) const +void AliPHOSDigit::Print(Option_t *) const { printf("PHOS digit: Amp=%d, Id=%d, Time=%f, NPrim=%d ",fAmp,fId,fTime,fNprimary); for(Int_t index = 0; index fAngle){ @@ -275,7 +275,7 @@ void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TM } Float_t phi = GetPHOSAngle( tmpPHOS->GetPHOSMod()) ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; Float_t rphi = phi / kRADDEG ; TRotation rot ; @@ -283,6 +283,7 @@ void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TM TRotation dummy = rot.Invert() ; // to transform from original frame to rotate frame gpos.Transform(rot) ; // rotate the baby + gmat = 0; // Not implemented yet } @@ -305,7 +306,7 @@ void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) co } Float_t phi = GetPHOSAngle( tmpPHOS->GetPHOSMod()) ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; Float_t rphi = phi / kRADDEG ; TRotation rot ; @@ -408,7 +409,7 @@ void AliPHOSGeometry::RelPosInAlice(const Int_t id, TVector3 & pos ) const pos.SetY(y0) ; Float_t phi = GetPHOSAngle( phosmodule) ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; Float_t rphi = phi / kRADDEG ; TRotation rot ; diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h index 4aeef87ce50..189a65da99a 100644 --- a/PHOS/AliPHOSGeometry.h +++ b/PHOS/AliPHOSGeometry.h @@ -48,7 +48,7 @@ public: fgGeom = 0; fRotMatrixArray = 0; } - AliPHOSGeometry(const AliPHOSGeometry & geom) { + AliPHOSGeometry(const AliPHOSGeometry & geom) : AliGeometry(geom) { // cpy ctor requested by Coding Convention but not yet needed assert(0==1) ; diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h index 9b2b3c0e077..a97e4632c26 100644 --- a/PHOS/AliPHOSGetter.h +++ b/PHOS/AliPHOSGetter.h @@ -50,7 +50,7 @@ class AliPHOSGetter : public TObject { AliPHOSGetter(){ // ctor: this is a singleton, the ctor should never be called but cint needs it as public Fatal("ctor", "AliPHOSGetter is a singleton default ctor not callable") ; } - AliPHOSGetter(const AliPHOSGetter & obj) { + AliPHOSGetter(const AliPHOSGetter & obj) : TObject(obj) { // cpy ctor requested by Coding Convention Fatal("cpy ctor", "not implemented") ; } diff --git a/PHOS/AliPHOSHit.cxx b/PHOS/AliPHOSHit.cxx index c9b8519efca..3c06402ab1a 100644 --- a/PHOS/AliPHOSHit.cxx +++ b/PHOS/AliPHOSHit.cxx @@ -38,7 +38,7 @@ ClassImp(AliPHOSHit) //____________________________________________________________________________ - AliPHOSHit::AliPHOSHit(const AliPHOSHit & hit) + AliPHOSHit::AliPHOSHit(const AliPHOSHit & hit) : AliHit(hit) { // copy ctor fX = hit.fX ; diff --git a/PHOS/AliPHOSImpact.cxx b/PHOS/AliPHOSImpact.cxx index dd66ec79b29..896cc6bdda2 100644 --- a/PHOS/AliPHOSImpact.cxx +++ b/PHOS/AliPHOSImpact.cxx @@ -39,6 +39,7 @@ ClassImp(AliPHOSImpact) //____________________________________________________________________________ AliPHOSImpact::AliPHOSImpact(const AliPHOSImpact & hit) + : AliHit(hit) { // copy ctor diff --git a/PHOS/AliPHOSJet.h b/PHOS/AliPHOSJet.h index 1419fe3a805..b5279703835 100644 --- a/PHOS/AliPHOSJet.h +++ b/PHOS/AliPHOSJet.h @@ -24,7 +24,7 @@ class AliPHOSJet : public TObject { public: AliPHOSJet() ; // ctor - AliPHOSJet(const AliPHOSJet & jet) { + AliPHOSJet(const AliPHOSJet & jet) : TObject(jet){ // copy ctor: no implementation yet Fatal("cpy ctor", "not implemented") ; } diff --git a/PHOS/AliPHOSJetFinder.h b/PHOS/AliPHOSJetFinder.h index 7dd66dbc6ad..8bccfa535b1 100644 --- a/PHOS/AliPHOSJetFinder.h +++ b/PHOS/AliPHOSJetFinder.h @@ -22,7 +22,7 @@ class AliPHOSJetFinder : public TNamed { public: AliPHOSJetFinder() ; // ctor - AliPHOSJetFinder(const AliPHOSJetFinder & jet) { + AliPHOSJetFinder(const AliPHOSJetFinder & jet) : TNamed(jet) { // copy ctor: no implementation yet Fatal("cpy ctor", "not implemented") ; } diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index 453ed14996c..9bb1157b6ad 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -56,7 +56,7 @@ class AliPHOSLoader : public AliLoader { public: AliPHOSLoader(); - AliPHOSLoader(const AliPHOSLoader & obj){} + AliPHOSLoader(const AliPHOSLoader & obj) : AliLoader(obj) {} AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername); virtual ~AliPHOSLoader() ; diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 722d14b0592..12c62c01e57 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -33,7 +33,7 @@ class AliPHOSPID : public TTask { AliPHOSPID() ; // ctor AliPHOSPID (const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; - AliPHOSPID(const AliPHOSPID & pid) {;} + AliPHOSPID(const AliPHOSPID & pid) : TTask(pid) {;} virtual ~AliPHOSPID() ; // dtor virtual void Exec(Option_t * option) { Warning("Exec", "not defined" ) ; } diff --git a/PHOS/AliPHOSQAChecker.h b/PHOS/AliPHOSQAChecker.h index 2df6c2238ec..f6a0b7a9917 100644 --- a/PHOS/AliPHOSQAChecker.h +++ b/PHOS/AliPHOSQAChecker.h @@ -33,7 +33,7 @@ public: fCheckable = 0; } ; // default ctor (not to be used) AliPHOSQAChecker(const char * name, const char * title) ; // ctor - AliPHOSQAChecker(AliPHOSQAChecker& obj) {assert(0==1);} + AliPHOSQAChecker(AliPHOSQAChecker& obj) : TTask(obj) {assert(0==1);} virtual ~AliPHOSQAChecker() ; // dtor void Alarms() { ExecuteTask("A") ; } diff --git a/PHOS/AliPHOSQAFloatCheckable.h b/PHOS/AliPHOSQAFloatCheckable.h index 3906ea14842..6740690ad3f 100644 --- a/PHOS/AliPHOSQAFloatCheckable.h +++ b/PHOS/AliPHOSQAFloatCheckable.h @@ -25,7 +25,8 @@ public: AliPHOSQAFloatCheckable(){} // default ctor not to be used AliPHOSQAFloatCheckable(const char * name) ; // ctor - AliPHOSQAFloatCheckable(AliPHOSQAFloatCheckable& obj) {assert(0==1);} + AliPHOSQAFloatCheckable(AliPHOSQAFloatCheckable& obj) + : AliPHOSQAVirtualCheckable(obj) {assert(0==1);} virtual ~AliPHOSQAFloatCheckable() ; // dtor virtual Float_t GetValue() const { return fValue ; } diff --git a/PHOS/AliPHOSQAIntCheckable.h b/PHOS/AliPHOSQAIntCheckable.h index 94a3f556a13..c447f20c691 100644 --- a/PHOS/AliPHOSQAIntCheckable.h +++ b/PHOS/AliPHOSQAIntCheckable.h @@ -25,7 +25,8 @@ public: AliPHOSQAIntCheckable(){} // default ctor not to be used AliPHOSQAIntCheckable(const char * name) ; // ctor - AliPHOSQAIntCheckable(AliPHOSQAIntCheckable& obj) {assert(0==1);} + AliPHOSQAIntCheckable(AliPHOSQAIntCheckable& obj) + : AliPHOSQAVirtualCheckable(obj) {assert(0==1);} virtual ~AliPHOSQAIntCheckable() ; // dtor virtual Float_t GetValue() const { return (Float_t)fValue ; } diff --git a/PHOS/AliPHOSQAObjectCheckable.h b/PHOS/AliPHOSQAObjectCheckable.h index a6a07467628..07425452b64 100644 --- a/PHOS/AliPHOSQAObjectCheckable.h +++ b/PHOS/AliPHOSQAObjectCheckable.h @@ -27,7 +27,8 @@ public: fObject = 0; } // default ctor not to be used AliPHOSQAObjectCheckable(const char * name) ; // ctor - AliPHOSQAObjectCheckable(AliPHOSQAObjectCheckable& obj) {assert(0==1);} + AliPHOSQAObjectCheckable(AliPHOSQAObjectCheckable& obj) : AliPHOSQAVirtualCheckable(obj) + {assert(0==1);} virtual ~AliPHOSQAObjectCheckable() ; // dtor virtual TObject * GetObject() const { return fObject ; } diff --git a/PHOS/AliPHOSQAVirtualCheckable.h b/PHOS/AliPHOSQAVirtualCheckable.h index 013be75ea19..948c42693e6 100644 --- a/PHOS/AliPHOSQAVirtualCheckable.h +++ b/PHOS/AliPHOSQAVirtualCheckable.h @@ -35,7 +35,7 @@ public: fAlarms = 0; } // default ctor not to be used AliPHOSQAVirtualCheckable(const char * name) ; // ctor - AliPHOSQAVirtualCheckable(AliPHOSQAVirtualCheckable& obj) {assert(0==1);} + AliPHOSQAVirtualCheckable(AliPHOSQAVirtualCheckable& obj) : TNamed(obj) {assert(0==1);} virtual ~AliPHOSQAVirtualCheckable() ; // dtor void AddChecker(AliPHOSQAChecker * ch) ; diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx index bede29d1c65..740c94fbec4 100644 --- a/PHOS/AliPHOSRecParticle.cxx +++ b/PHOS/AliPHOSRecParticle.cxx @@ -38,6 +38,7 @@ ClassImp(AliPHOSRecParticle) //____________________________________________________________________________ AliPHOSRecParticle::AliPHOSRecParticle(const AliPHOSRecParticle & rp) + : AliPHOSFastRecParticle(rp) { // copy ctor diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx index 2457ab6d98b..e0c987e474f 100644 --- a/PHOS/AliPHOSRecPoint.cxx +++ b/PHOS/AliPHOSRecPoint.cxx @@ -149,7 +149,7 @@ void AliPHOSRecPoint::ExecuteEvent(Int_t event, Int_t px, Int_t py) clustertext ->Draw(""); } gPad->Update() ; - Print() ; + Print("dummy") ; delete[] xi ; delete[] zi ; } @@ -171,7 +171,7 @@ break; } } //____________________________________________________________________________ -void AliPHOSRecPoint::EvalAll(Float_t logWeight,TClonesArray * digits) +void AliPHOSRecPoint::EvalAll(Float_t,TClonesArray * digits) { //evaluates (if necessary) all RecPoint data members diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h index 4d47c9fee78..e2de3f7a7c9 100644 --- a/PHOS/AliPHOSRecPoint.h +++ b/PHOS/AliPHOSRecPoint.h @@ -30,7 +30,7 @@ class AliPHOSRecPoint : public AliRecPoint { AliPHOSRecPoint() ; // ctor AliPHOSRecPoint(const char * opt) ; // ctor - AliPHOSRecPoint(const AliPHOSRecPoint & rp) { + AliPHOSRecPoint(const AliPHOSRecPoint & rp) : AliRecPoint(rp) { // cpy ctor requested by Coding Convention // but not yet needed assert(0==1) ; @@ -48,7 +48,7 @@ class AliPHOSRecPoint : public AliRecPoint { 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 EvalAll(Float_t ,TClonesArray * digits) ; virtual void EvalPHOSMod(AliPHOSDigit * digit) ; virtual void EvalPrimaries(TClonesArray * digits) ; virtual void GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const ; // return global position in ALICE @@ -61,7 +61,7 @@ class AliPHOSRecPoint : public AliRecPoint { return kTRUE ; } virtual void Paint(Option_t * option=""); - virtual void Print(Option_t * opt = "void") const { + virtual void Print(Option_t *) const { // Print prototype } diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h index 30951b2627b..58d5cf8a875 100644 --- a/PHOS/AliPHOSReconstructioner.h +++ b/PHOS/AliPHOSReconstructioner.h @@ -32,7 +32,7 @@ public: AliPHOSReconstructioner() ; //ctor AliPHOSReconstructioner(const char * headreFile, const char * branchName = "Default"); - AliPHOSReconstructioner(const AliPHOSReconstructioner & rec) { + AliPHOSReconstructioner(const AliPHOSReconstructioner & rec) : TTask(rec) { // cpy ctor: // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index a5c2d580abc..dabc4c98b08 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -88,7 +88,9 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, const char * e } //____________________________________________________________________________ -AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) { +AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer & sd) + : TTask(sd) +{ //cpy ctor fA = sd.fA ; diff --git a/PHOS/AliPHOSSupportGeometry.h b/PHOS/AliPHOSSupportGeometry.h index fbff6ba2d83..762a6da9b11 100644 --- a/PHOS/AliPHOSSupportGeometry.h +++ b/PHOS/AliPHOSSupportGeometry.h @@ -24,11 +24,11 @@ class AliPHOSSupportGeometry : public TObject { public: - AliPHOSSupportGeometry(); - AliPHOSSupportGeometry(const AliPHOSSupportGeometry & cpv) { - // cpy ctor requested by Coding Convention but not yet needed - assert(0==1) ; - } + AliPHOSSupportGeometry(); + AliPHOSSupportGeometry(const AliPHOSSupportGeometry & geom) : TObject(geom) { + // cpy ctor requested by Coding Convention but not yet needed + assert(0==1) ; + } virtual ~AliPHOSSupportGeometry(void) {} AliPHOSSupportGeometry & operator = (const AliPHOSSupportGeometry & rvalue) { diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx index dcc0ca5588c..3714274f416 100644 --- a/PHOS/AliPHOSTrackSegment.cxx +++ b/PHOS/AliPHOSTrackSegment.cxx @@ -54,6 +54,7 @@ AliPHOSTrackSegment::AliPHOSTrackSegment( AliPHOSEmcRecPoint * emc , //____________________________________________________________________________ AliPHOSTrackSegment::AliPHOSTrackSegment( const AliPHOSTrackSegment & ts) + : TObject(ts) { // Copy ctor diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index 74e7a891284..d6159460b6d 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -32,7 +32,7 @@ public: AliPHOSTrackSegmentMaker(); AliPHOSTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; - AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) { ; } + AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : TTask(tsmaker) { ; } virtual ~ AliPHOSTrackSegmentMaker() ; virtual void Exec(Option_t * option){Warning("Exec", "Not Defined" ) ; } diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index e26e17a2be7..4fb0b075344 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -29,7 +29,7 @@ public: AliPHOSTrackSegmentMakerv1() ; AliPHOSTrackSegmentMakerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName); - AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) { + AliPHOSTrackSegmentMakerv1(const AliPHOSTrackSegmentMakerv1 & tsm) : AliPHOSTrackSegmentMaker(tsm) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index 5b2ac627048..e872b6a7ccd 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -104,7 +104,7 @@ void AliPHOSv0:: BuildGeometryforEMC(void) const Int_t kColorPHOS = kRed ; const Int_t kColorXTAL = kBlue ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; AliPHOSGeometry * geom = GetGeometry() ; AliPHOSEMCAGeometry * emcg = geom->GetEMCAGeometry() ; @@ -184,7 +184,7 @@ void AliPHOSv0:: BuildGeometryforCPV(void) */ //END_HTML - const Double_t kRADDEG = 180.0 / kPI ; + const Double_t kRADDEG = 180.0 / TMath::Pi() ; const Int_t kColorCPV = kGreen ; const Int_t kColorFrame = kYellow ; const Int_t kColorGassiplex = kRed; @@ -320,7 +320,7 @@ void AliPHOSv0::CreateGeometry() // --- Position PHOS mdules in ALICE setup --- Int_t idrotm[99] ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; Float_t * phosParams = geom->GetPHOSParams() ; Float_t r = geom->GetIPtoOuterCoverDistance() + phosParams[3] - geom->GetCPVBoxSize(1) ; diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h index e828d539873..f8e5673f1a6 100644 --- a/PHOS/AliPHOSv0.h +++ b/PHOS/AliPHOSv0.h @@ -23,7 +23,7 @@ class AliPHOSv0 : public AliPHOS { AliPHOSv0() {} AliPHOSv0(const char *name, const char *title="") ; - AliPHOSv0(const AliPHOSv0 & phos) { + AliPHOSv0(const AliPHOSv0 & phos) : AliPHOS(phos) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; @@ -32,7 +32,8 @@ class AliPHOSv0 : public AliPHOS { // dtor } - virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) { +// virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) { + virtual void AddHit( Int_t, Int_t, Int_t, Int_t, Float_t*) { // useless since there are no hits Fatal("AddHit", "not to be used with v0") ; } diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index 5f08ca9036e..3487d7da2bb 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -25,7 +25,7 @@ public: AliPHOSv1(void) ; AliPHOSv1(const char *name, const char *title="") ; - AliPHOSv1(const AliPHOSv1 & phos) { + AliPHOSv1(const AliPHOSv1 & phos) : AliPHOSv0(phos) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; diff --git a/PHOS/AliPHOSvFast.cxx b/PHOS/AliPHOSvFast.cxx index 763cc3f64cb..07d9cfac0dd 100644 --- a/PHOS/AliPHOSvFast.cxx +++ b/PHOS/AliPHOSvFast.cxx @@ -138,7 +138,7 @@ void AliPHOSvFast::BuildGeometry() const Int_t kColorPHOS = kRed ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; new TBRIK( "BigBox", "PHOS box", "void", GetBigBox(0)/2, GetBigBox(1)/2, @@ -198,7 +198,7 @@ void AliPHOSvFast::CreateGeometry() // --- Position PHOS mdules in ALICE setup --- Int_t idrotm[99] ; - Double_t const kRADDEG = 180.0 / kPI ; + Double_t const kRADDEG = 180.0 / TMath::Pi() ; for( Int_t i = 1; i <= GetGeometry()->GetNModules(); i++ ) { diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h index 0988923b806..0fbfdebc2a4 100644 --- a/PHOS/AliPHOSvFast.h +++ b/PHOS/AliPHOSvFast.h @@ -32,17 +32,13 @@ public: AliPHOSvFast() ; AliPHOSvFast(const char *name, const char *title="") ; - AliPHOSvFast(const AliPHOSvFast & fast) { + AliPHOSvFast(const AliPHOSvFast & fast) : AliPHOS(fast) { // cpy ctor: no implementation yet // requested by the Coding Convention assert(0==1) ; } virtual ~AliPHOSvFast(void) ; - virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) { - // useless since there are no hits - assert(0==1) ; - } void AddRecParticle(const AliPHOSFastRecParticle & rp) ; // adds primary particle to the RecParticles list virtual void BuildGeometry(void) ; // creates the geometry for the ROOT display virtual void CreateGeometry(void) ; // creates the geometry for GEANT diff --git a/PHOS/AliPHOSvImpacts.h b/PHOS/AliPHOSvImpacts.h index 6a0cc827a2e..c3616769173 100644 --- a/PHOS/AliPHOSvImpacts.h +++ b/PHOS/AliPHOSvImpacts.h @@ -27,7 +27,7 @@ public: AliPHOSvImpacts(void) ; AliPHOSvImpacts(const char *name, const char *title="") ; - AliPHOSvImpacts(const AliPHOSvImpacts & phos) { + AliPHOSvImpacts(const AliPHOSvImpacts & phos) : AliPHOSv1(phos) { // cpy ctor: no implementation yet // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; -- 2.39.3