From 17323043f584137499bf2a6e2f2e2da17448b152 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 8 Nov 2004 12:06:21 +0000 Subject: [PATCH] Removing meaningless type qualifier on return type (icc warning 858) --- CRT/AliCRTConstants.cxx | 30 +++++++++++++------------- CRT/AliCRTConstants.h | 30 +++++++++++++------------- CRT/AliGenCRT.cxx | 4 ++-- CRT/AliGenCRT.h | 6 +++--- EMCAL/AliEMCALClusterizer.h | 2 +- EMCAL/AliEMCALClusterizerv1.h | 2 +- EMCAL/AliEMCALFastRecParticle.h | 4 ++-- EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx | 6 +++--- EMCAL/AliEMCALJetFinderAlgoUA1Unit.h | 6 +++--- EMCAL/AliEMCALLink.h | 6 +++--- EMCAL/AliEMCALPID.h | 2 +- EMCAL/AliEMCALPIDv1.h | 2 +- EMCAL/AliEMCALRecParticle.cxx | 4 ++-- EMCAL/AliEMCALRecParticle.h | 4 ++-- EMCAL/AliEMCALTrackSegmentMaker.h | 2 +- EMCAL/AliEMCALTrackSegmentMakerv1.h | 2 +- FMD/AliFMD.cxx | 2 +- FMD/AliFMD.h | 2 +- HLT/src/AliL3Transform.h | 14 ++++++------ ITS/AliITSresponseSDD.h | 6 +++--- MUON/AliMUONDDLTracker.h | 8 +++---- MUON/AliMUONDDLTrigger.h | 2 +- MUON/AliMUONRecoTrack.cxx | 4 ++-- MUON/AliMUONRecoTrack.h | 20 ++++++++--------- MUON/AliMUONScalerEventTrigger.h | 8 +++---- MUON/AliMUONSubEventTracker.h | 2 +- MUON/AliMUONSubEventTrigger.h | 2 +- PHOS/AliPHOSCalibrationData.h | 2 +- PHOS/AliPHOSFastRecParticle.h | 4 ++-- PHOS/AliPHOSPIDv1.cxx | 8 +++---- PHOS/AliPHOSPIDv1.h | 8 +++---- PHOS/AliPHOSRecParticle.cxx | 4 ++-- PHOS/AliPHOSRecParticle.h | 4 ++-- PHOS/AliPHOSSDigitizer.h | 2 +- PHOS/AliPHOSTrackSegmentMaker.h | 2 +- PHOS/AliPHOSTrackSegmentMakerv1.h | 2 +- RAW/AliMDC.h | 18 ++++++++-------- 37 files changed, 118 insertions(+), 118 deletions(-) diff --git a/CRT/AliCRTConstants.cxx b/CRT/AliCRTConstants.cxx index 55ea2b7c96c..20b0221e27d 100644 --- a/CRT/AliCRTConstants.cxx +++ b/CRT/AliCRTConstants.cxx @@ -86,105 +86,105 @@ AliCRTConstants::~AliCRTConstants() } //_____________________________________________________________________________ -const Float_t AliCRTConstants::CageLenght() const +Float_t AliCRTConstants::CageLenght() const { // Module lenght return fgkCageLenght; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::CageWidth() const +Float_t AliCRTConstants::CageWidth() const { // Module width return fgkCageWidth; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::CageHeight() const +Float_t AliCRTConstants::CageHeight() const { // Module height return fgkCageHeight; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::SinglePaletteLenght() const +Float_t AliCRTConstants::SinglePaletteLenght() const { // Lenght of the scintillator active zone for a single counter return fgkSinglePaletteLenght; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::SinglePaletteWidth() const +Float_t AliCRTConstants::SinglePaletteWidth() const { // Width of the scintillator active zone for a single counter return fgkSinglePaletteWidth; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::SinglePaletteHeight() const +Float_t AliCRTConstants::SinglePaletteHeight() const { // Height of the scintillator active zone for a single counter return fgkSinglePaletteHeight; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::ActiveAreaGap() const +Float_t AliCRTConstants::ActiveAreaGap() const { // Gap betwen scintillators return fgkActiveAreaGap; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::ActiveAreaLenght() const +Float_t AliCRTConstants::ActiveAreaLenght() const { // Lenght of the scintillator active zone return fgkActiveAreaLenght; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::ActiveAreaWidth() const +Float_t AliCRTConstants::ActiveAreaWidth() const { // Width of the scintillator active zone return fgkActiveAreaWidth; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::ActiveAreaHeight() const +Float_t AliCRTConstants::ActiveAreaHeight() const { // Height of the scintillator active zone return fgkActiveAreaHeight; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::MagnetWidth() const +Float_t AliCRTConstants::MagnetWidth() const { // Magnet width return fgkMagnetWidth; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::MagnetLenght() const +Float_t AliCRTConstants::MagnetLenght() const { // Magnet lenght return fgkMagnetLenght; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::MagMinRadius() const +Float_t AliCRTConstants::MagMinRadius() const { // Magnet Inner radius return fgkMagMinRadius; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::MagMaxRadius() const +Float_t AliCRTConstants::MagMaxRadius() const { // Magnet outer radius return fgkMagMaxRadius; } //_____________________________________________________________________________ -const Float_t AliCRTConstants::Depth() const +Float_t AliCRTConstants::Depth() const { // Alice IP depth return fgkDepth; diff --git a/CRT/AliCRTConstants.h b/CRT/AliCRTConstants.h index e081707c153..3e894143822 100644 --- a/CRT/AliCRTConstants.h +++ b/CRT/AliCRTConstants.h @@ -32,25 +32,25 @@ public: static AliCRTConstants* Instance(); - const Float_t CageLenght() const; - const Float_t CageWidth() const; - const Float_t CageHeight() const; + Float_t CageLenght() const; + Float_t CageWidth() const; + Float_t CageHeight() const; - const Float_t SinglePaletteLenght() const; - const Float_t SinglePaletteWidth() const; - const Float_t SinglePaletteHeight() const; + Float_t SinglePaletteLenght() const; + Float_t SinglePaletteWidth() const; + Float_t SinglePaletteHeight() const; - const Float_t ActiveAreaGap() const; - const Float_t ActiveAreaLenght() const; - const Float_t ActiveAreaWidth() const; - const Float_t ActiveAreaHeight() const; + Float_t ActiveAreaGap() const; + Float_t ActiveAreaLenght() const; + Float_t ActiveAreaWidth() const; + Float_t ActiveAreaHeight() const; - const Float_t MagnetWidth() const; - const Float_t MagnetLenght() const; - const Float_t MagMinRadius() const; - const Float_t MagMaxRadius() const; + Float_t MagnetWidth() const; + Float_t MagnetLenght() const; + Float_t MagMinRadius() const; + Float_t MagMaxRadius() const; - const Float_t Depth() const; + Float_t Depth() const; protected: AliCRTConstants(); diff --git a/CRT/AliGenCRT.cxx b/CRT/AliGenCRT.cxx index ac24d5fdfc5..7bca678199b 100644 --- a/CRT/AliGenCRT.cxx +++ b/CRT/AliGenCRT.cxx @@ -517,7 +517,7 @@ void AliGenCRT::InitZenithalAngleGeneration() } //____________________________________________________________________________ -const Float_t AliGenCRT::GetZenithAngle(Float_t mom) const +Float_t AliGenCRT::GetZenithAngle(Float_t mom) const { Float_t zenith = 0.; @@ -556,7 +556,7 @@ const Float_t AliGenCRT::GetZenithAngle(Float_t mom) const } //_____________________________________________________________________________ -const Float_t AliGenCRT::GetMomentum() const +Float_t AliGenCRT::GetMomentum() const { // // diff --git a/CRT/AliGenCRT.h b/CRT/AliGenCRT.h index d063c2b8424..15607c23c7e 100644 --- a/CRT/AliGenCRT.h +++ b/CRT/AliGenCRT.h @@ -31,14 +31,14 @@ class AliGenCRT : public AliGenerator { void SetAzimuthalAngleRange(Float_t min, Float_t max=0) {fAzimuthMin=min;fAzimuthMax=max;} void SetGridRange(Int_t nx,Float_t xwidth, Int_t nz, Float_t zwidth); - const Float_t GetMomentumResolution() const {return fPResolution;} + Float_t GetMomentumResolution() const {return fPResolution;} void SetMomentumDistrubutionFunction(TF1 *func) {fMomentumDist=func;} void SetZenithalDistributionFunction(TF1 *func) {fZenithDist = func;} void SetMomentumResolution(Float_t res=1.) {fPResolution=res;} - const Float_t GetMomentum() const; - const Float_t GetZenithAngle(Float_t mom) const; + Float_t GetMomentum() const; + Float_t GetZenithAngle(Float_t mom) const; // The following methods are for testing pourpuses TF1* GetMomentumDistibution() const {return fMomentumDist;} diff --git a/EMCAL/AliEMCALClusterizer.h b/EMCAL/AliEMCALClusterizer.h index bd61d21661d..1eafc6f119e 100644 --- a/EMCAL/AliEMCALClusterizer.h +++ b/EMCAL/AliEMCALClusterizer.h @@ -33,7 +33,7 @@ public: virtual Float_t GetTowerLogWeight()const {Warning("GetTowerLogWeight", "Not Defined") ; return 0. ; } virtual Float_t GetTimeGate() const {Warning("GetTimeGate", "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 Int_t GetRecPointsInRun() const {Warning("GetRecPointsInRun", "Not Defined") ; return 0 ; } virtual const char * GetDigitsBranch() const {Warning("GetDigitsBranch", "Not Defined") ; return 0 ; } virtual void MakeClusters() const {Warning("MakeClusters", "Not Defined") ; } diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h index 5b70dba6a83..e2648d994ac 100644 --- a/EMCAL/AliEMCALClusterizerv1.h +++ b/EMCAL/AliEMCALClusterizerv1.h @@ -51,7 +51,7 @@ public: virtual Float_t GetTimeGate() const { return fTimeGate ; } virtual const char * GetRecPointsBranch() const{ return GetName() ;} - virtual const Int_t GetRecPointsInRun() const {return fRecPointsInRun ;} + virtual Int_t GetRecPointsInRun() const {return fRecPointsInRun ;} void Exec(Option_t *option); // Does the job diff --git a/EMCAL/AliEMCALFastRecParticle.h b/EMCAL/AliEMCALFastRecParticle.h index db8b731069a..7faa0dd3071 100644 --- a/EMCAL/AliEMCALFastRecParticle.h +++ b/EMCAL/AliEMCALFastRecParticle.h @@ -38,9 +38,9 @@ class AliEMCALFastRecParticle : public TParticle { // returns the index of this in the list return fIndexInList ; } - virtual const Int_t GetNPrimaries() const {return 0 ;} + virtual Int_t GetNPrimaries() const {return 0 ;} virtual const TParticle * GetPrimary(Int_t /*index=0*/) const {return 0 ;} - const Int_t GetType() const { + Int_t GetType() const { // returns the type of the particle return fType ; } diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx index 921fa33d5a9..2e398be5382 100755 --- a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx +++ b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx @@ -43,7 +43,7 @@ AliEMCALJetFinderAlgoUA1Unit::~AliEMCALJetFinderAlgoUA1Unit() } -const Bool_t AliEMCALJetFinderAlgoUA1Unit::operator>(AliEMCALJetFinderAlgoUA1Unit unit) +Bool_t AliEMCALJetFinderAlgoUA1Unit::operator>(AliEMCALJetFinderAlgoUA1Unit unit) const { // Greater than operator used by sort if( fUnitEnergy > unit.GetUnitEnergy()) @@ -52,7 +52,7 @@ const Bool_t AliEMCALJetFinderAlgoUA1Unit::operator>(AliEMCALJetFinderAlgoUA1Uni return kFALSE; } -const Bool_t AliEMCALJetFinderAlgoUA1Unit::operator<( AliEMCALJetFinderAlgoUA1Unit unit) +Bool_t AliEMCALJetFinderAlgoUA1Unit::operator<( AliEMCALJetFinderAlgoUA1Unit unit) const { // Less than operator used by sort if( fUnitEnergy < unit.GetUnitEnergy()) @@ -61,7 +61,7 @@ const Bool_t AliEMCALJetFinderAlgoUA1Unit::operator<( AliEMCALJetFinderAlgoUA1Un return kFALSE; } -const Bool_t AliEMCALJetFinderAlgoUA1Unit::operator==( AliEMCALJetFinderAlgoUA1Unit unit) +Bool_t AliEMCALJetFinderAlgoUA1Unit::operator==( AliEMCALJetFinderAlgoUA1Unit unit) const { // equality operator used by sort if( fUnitEnergy == unit.GetUnitEnergy()) diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.h b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.h index 48e50b0835c..80c09d1db10 100755 --- a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.h +++ b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.h @@ -39,9 +39,9 @@ class AliEMCALJetFinderAlgoUA1Unit : public TObject return fUnitFlag; } - const Bool_t operator> ( AliEMCALJetFinderAlgoUA1Unit unit1); - const Bool_t operator< ( AliEMCALJetFinderAlgoUA1Unit unit1); - const Bool_t operator== ( AliEMCALJetFinderAlgoUA1Unit unit1); + Bool_t operator> ( AliEMCALJetFinderAlgoUA1Unit unit1) const; + Bool_t operator< ( AliEMCALJetFinderAlgoUA1Unit unit1) const; + Bool_t operator== ( AliEMCALJetFinderAlgoUA1Unit unit1) const; protected: Float_t fUnitEnergy; // Energy of the unit diff --git a/EMCAL/AliEMCALLink.h b/EMCAL/AliEMCALLink.h index d402b3ab55a..c517f65eebb 100644 --- a/EMCAL/AliEMCALLink.h +++ b/EMCAL/AliEMCALLink.h @@ -30,9 +30,9 @@ public: // dtor } Int_t Compare(const TObject * obj) const ; - const Int_t GetECA(void) const { return fECAN ; } - const Int_t GetOther(void) const { return fOtherN ; } - const Float_t GetProd(void) const { return fProd ; } + Int_t GetECA(void) const { return fECAN ; } + Int_t GetOther(void) const { return fOtherN ; } + Float_t GetProd(void) const { return fProd ; } Bool_t IsSortable() const{ return kTRUE; } private: diff --git a/EMCAL/AliEMCALPID.h b/EMCAL/AliEMCALPID.h index e4fd3858a86..23f5a37d066 100644 --- a/EMCAL/AliEMCALPID.h +++ b/EMCAL/AliEMCALPID.h @@ -36,7 +36,7 @@ class AliEMCALPID : public TTask { virtual ~AliEMCALPID() ; // dtor virtual void Exec(Option_t *) = 0; - virtual const Int_t GetRecParticlesInRun() const { Warning("GetRecParticlesInRun", "not defined" ) ; return 0 ;} + virtual Int_t GetRecParticlesInRun() const { Warning("GetRecParticlesInRun", "not defined" ) ; return 0 ;} virtual void Print() const { Warning("Print", "not defined" ) ;} void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } diff --git a/EMCAL/AliEMCALPIDv1.h b/EMCAL/AliEMCALPIDv1.h index 68a7f98bf28..bd1e1cfdb37 100644 --- a/EMCAL/AliEMCALPIDv1.h +++ b/EMCAL/AliEMCALPIDv1.h @@ -37,7 +37,7 @@ class AliEMCALPIDv1 : public AliEMCALPID { virtual void Exec(Option_t * option) ; - virtual const Int_t GetRecParticlesInRun() const {return fRecParticlesInRun ;} + virtual Int_t GetRecParticlesInRun() const {return fRecParticlesInRun ;} Float_t GetCalibratedEnergy (Float_t e) const; TVector3 GetMomentumDirection(AliEMCALRecPoint * emc)const ; diff --git a/EMCAL/AliEMCALRecParticle.cxx b/EMCAL/AliEMCALRecParticle.cxx index a3e7cd32224..f5d4df2a224 100644 --- a/EMCAL/AliEMCALRecParticle.cxx +++ b/EMCAL/AliEMCALRecParticle.cxx @@ -80,13 +80,13 @@ AliEMCALRecParticle::AliEMCALRecParticle(const AliEMCALRecParticle & rp) } //____________________________________________________________________________ -const Int_t AliEMCALRecParticle::GetNPrimaries() const +Int_t AliEMCALRecParticle::GetNPrimaries() const { return -1; } //____________________________________________________________________________ -const Int_t AliEMCALRecParticle::GetNPrimariesToRecParticles() const +Int_t AliEMCALRecParticle::GetNPrimariesToRecParticles() const { // Returns the number of primaries at the origine of a RecParticle Int_t rv = 0 ; diff --git a/EMCAL/AliEMCALRecParticle.h b/EMCAL/AliEMCALRecParticle.h index f17a1707c7f..ef8425f424d 100644 --- a/EMCAL/AliEMCALRecParticle.h +++ b/EMCAL/AliEMCALRecParticle.h @@ -31,8 +31,8 @@ class AliEMCALRecParticle : public AliEMCALFastRecParticle { virtual ~AliEMCALRecParticle(){ } Int_t GetEMCALRPIndex()const { return fEMCALRecPoint ; } - virtual const Int_t GetNPrimariesToRecParticles() const ; - virtual const Int_t GetNPrimaries() const ; + virtual Int_t GetNPrimariesToRecParticles() const ; + virtual Int_t GetNPrimaries() const ; TVector3 GetPos() const { return fPos ; } virtual const TParticle * GetPrimary(Int_t index) const ; const Double_t *GetPID(); diff --git a/EMCAL/AliEMCALTrackSegmentMaker.h b/EMCAL/AliEMCALTrackSegmentMaker.h index f47342b38ef..8243b86eaff 100644 --- a/EMCAL/AliEMCALTrackSegmentMaker.h +++ b/EMCAL/AliEMCALTrackSegmentMaker.h @@ -34,7 +34,7 @@ public: virtual ~ AliEMCALTrackSegmentMaker() ; virtual void Exec(Option_t *) = 0; - virtual const Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } + virtual Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } virtual void Print(Option_t *) = 0; virtual const char * Version() const {Warning("Version", "Not Defined" ) ; return 0 ; } diff --git a/EMCAL/AliEMCALTrackSegmentMakerv1.h b/EMCAL/AliEMCALTrackSegmentMakerv1.h index a3d53dcff44..68f4b9dedea 100644 --- a/EMCAL/AliEMCALTrackSegmentMakerv1.h +++ b/EMCAL/AliEMCALTrackSegmentMakerv1.h @@ -35,7 +35,7 @@ public: virtual ~ AliEMCALTrackSegmentMakerv1() ; // dtor - virtual const Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;} + virtual Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;} virtual void Exec(Option_t * option) ; Float_t HowClose(AliEMCALRecPoint * ec, AliEMCALRecPoint * rp, Bool_t &toofar) const ; diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx index 57277b7c594..489cdad6d9b 100644 --- a/FMD/AliFMD.cxx +++ b/FMD/AliFMD.cxx @@ -575,7 +575,7 @@ AliFMD::DrawDetector() } //____________________________________________________________________ -const Int_t +Int_t AliFMD::DistanceToPrimitive(Int_t, Int_t) { // diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h index b96f73a5c1a..8dfdbd42fb3 100644 --- a/FMD/AliFMD.h +++ b/FMD/AliFMD.h @@ -52,7 +52,7 @@ public: // Graphics and event display virtual void BuildGeometry(); virtual void DrawDetector(); - virtual const Int_t DistanceToPrimitive(Int_t px, Int_t py); + virtual Int_t DistanceToPrimitive(Int_t px, Int_t py); // Hit and digit management virtual void MakeBranch(Option_t *opt=" "); diff --git a/HLT/src/AliL3Transform.h b/HLT/src/AliL3Transform.h index 232a298cfcc..57beaca8163 100644 --- a/HLT/src/AliL3Transform.h +++ b/HLT/src/AliL3Transform.h @@ -142,13 +142,13 @@ class AliL3Transform { //getters static const Char_t* GetParamName() {return "75x40_100x60_150x60";} - static const Double_t Pi() {return fgkPi;} - static const Double_t PiHalf() {return fgkPi2;} - static const Double_t TwoPi() {return fgk2Pi;} - static const Double_t GetAnodeWireSpacing() {return fgkAnodeWireSpacing;} - static const Double_t GetBFact() {return fgkBFACT;} - static const Double_t ToRad() {return 1./fgkToDeg;} - static const Double_t ToDeg() {return fgkToDeg;} + static Double_t Pi() {return fgkPi;} + static Double_t PiHalf() {return fgkPi2;} + static Double_t TwoPi() {return fgk2Pi;} + static Double_t GetAnodeWireSpacing() {return fgkAnodeWireSpacing;} + static Double_t GetBFact() {return fgkBFACT;} + static Double_t ToRad() {return 1./fgkToDeg;} + static Double_t ToDeg() {return fgkToDeg;} static Int_t GetFirstRow(Int_t patch); static Int_t GetLastRow(Int_t patch); diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h index dbc191cad8c..46ec1a3b028 100644 --- a/ITS/AliITSresponseSDD.h +++ b/ITS/AliITSresponseSDD.h @@ -113,9 +113,9 @@ class AliITSresponseSDD : public AliITSresponse { Double_t Gain(Int_t mod,Int_t chip,Int_t ch)const {return fGain[mod][chip][ch]; } // these functions should be move to AliITSsegmentationSDD - const Int_t Modules()const{return fgkModules;}//Total number of SDD modules - const Int_t Chips() const{return fgkChips;} // Number of chips/module - const Int_t Channels() const{ return fgkChannels;}//Number of channels/chip + Int_t Modules()const{return fgkModules;}//Total number of SDD modules + Int_t Chips() const{return fgkChips;} // Number of chips/module + Int_t Channels() const{ return fgkChannels;}//Number of channels/chip //******** void PrintGains(); void Print(); diff --git a/MUON/AliMUONDDLTracker.h b/MUON/AliMUONDDLTracker.h index 2b42d3dc87b..d768d349ea9 100644 --- a/MUON/AliMUONDDLTracker.h +++ b/MUON/AliMUONDDLTracker.h @@ -19,8 +19,8 @@ public: Int_t GetBlkLength() const {return fBlkLength;} Int_t GetDspId() const {return fDSPId;} Int_t GetBlkTriggerWord(Int_t n) const {return fBlkTriggerWord[n];} - const Int_t GetPadding() const {return fPadding;} - const Int_t GetBlkHeaderLength() const {return fgkBlkHeaderLength;} + Int_t GetPadding() const {return fPadding;} + Int_t GetBlkHeaderLength() const {return fgkBlkHeaderLength;} void SetTotalBlkLength(Int_t l) {fTotalBlkLength = l;} void SetBlkLength(Int_t l) {fBlkLength = l;} @@ -39,7 +39,7 @@ public: void SetDSPId1(Int_t d) {fDSPId1 = d;} void SetDspTriggerWord(Int_t w, Int_t n) {fDspTriggerWord[n] = w;} void SetEventWord(Int_t w) {fEventWord = w;} - const Int_t GetDspHeaderLength() const {return fgkDspHeaderLength;} + Int_t GetDspHeaderLength() const {return fgkDspHeaderLength;} Int_t* GetBlkHeader() {return &fTotalBlkLength;} Int_t* GetDspHeader() {return &fTotalDspLength;} @@ -47,7 +47,7 @@ public: AliRawDataHeader GetHeader(){return fHeader;} Int_t GetHeaderSize() {return sizeof(AliRawDataHeader)/4;} // in words - const Int_t GetEoD() const {return fgkEndOfDDL;} + Int_t GetEoD() const {return fgkEndOfDDL;} private: diff --git a/MUON/AliMUONDDLTrigger.h b/MUON/AliMUONDDLTrigger.h index 8f82f839090..52f370f9a06 100644 --- a/MUON/AliMUONDDLTrigger.h +++ b/MUON/AliMUONDDLTrigger.h @@ -31,7 +31,7 @@ public: void SetGlobalOutput(Int_t out) {fGlobalOutput = out;} void SetEoD(Int_t e) {fEndOfDDL = e;} - const Int_t GetHeaderLength() const {return fgkHeaderLength;} + Int_t GetHeaderLength() const {return fgkHeaderLength;} UInt_t* GetEnhancedHeader() {return &fddlWord;} diff --git a/MUON/AliMUONRecoTrack.cxx b/MUON/AliMUONRecoTrack.cxx index 572ed7ffd55..7ee2c66b9c6 100644 --- a/MUON/AliMUONRecoTrack.cxx +++ b/MUON/AliMUONRecoTrack.cxx @@ -52,14 +52,14 @@ AliMUONRecoTrack::AliMUONRecoTrack(Bool_t active) } //------------------------------------------------------------------- -const Double_t AliMUONRecoTrack::Phi() +Double_t AliMUONRecoTrack::Phi() const { // Return trach phi angle return TMath::ATan2(fPr[2], fPr[1]); } //------------------------------------------------------------------- -const Double_t AliMUONRecoTrack::Theta() +Double_t AliMUONRecoTrack::Theta() const { // Return trach theta angle return TMath::ACos(fPr[2] / P()); diff --git a/MUON/AliMUONRecoTrack.h b/MUON/AliMUONRecoTrack.h index 5121b8b46b8..adf11ba457e 100644 --- a/MUON/AliMUONRecoTrack.h +++ b/MUON/AliMUONRecoTrack.h @@ -26,15 +26,15 @@ class AliMUONRecoTrack : public TObject AliMUONRecoTrack() { } AliMUONRecoTrack(Bool_t active); virtual ~AliMUONRecoTrack() { } //desctructor - const Double_t GetChi2r() const {return fChi2r;}; - const Double_t GetMomReconstr(Int_t axis) const {return fPr[axis];}; - const Int_t GetSign() const {return fSign;}; - const Double_t GetPosX(Int_t chamber) const {return fPosX[chamber];}; - const Double_t GetPosY(Int_t chamber) const {return fPosY[chamber];}; - const Double_t GetPosZ(Int_t chamber) const {return fPosZ[chamber];}; - const Double_t GetVertexPos() const { return fZvr;}; - const Double_t P() {return TMath::Sqrt(fPr[0]*fPr[0] + fPr[1]*fPr[1] + fPr[2]*fPr[2]);}; - const Double_t Phi(); + Double_t GetChi2r() const {return fChi2r;}; + Double_t GetMomReconstr(Int_t axis) const {return fPr[axis];}; + Int_t GetSign() const {return fSign;}; + Double_t GetPosX(Int_t chamber) const {return fPosX[chamber];}; + Double_t GetPosY(Int_t chamber) const {return fPosY[chamber];}; + Double_t GetPosZ(Int_t chamber) const {return fPosZ[chamber];}; + Double_t GetVertexPos() const { return fZvr;}; + Double_t P() const {return TMath::Sqrt(fPr[0]*fPr[0] + fPr[1]*fPr[1] + fPr[2]*fPr[2]);}; + Double_t Phi() const; void SetChi2r(Double_t chi) { fChi2r = chi;}; void SetHitPosition(Int_t chamber, Double_t x, Double_t y, Double_t z); void SetMomReconstr(Double_t px, Double_t py, Double_t pz); @@ -42,7 +42,7 @@ class AliMUONRecoTrack : public TObject void SetVertexPos(Double_t zvr) {fZvr = zvr;}; void SetFlag(Int_t flag) {fFlag = flag;}; - const Double_t Theta(); + Double_t Theta() const; void TrackInfo(); private: diff --git a/MUON/AliMUONScalerEventTrigger.h b/MUON/AliMUONScalerEventTrigger.h index 74081bad6d1..6dd5b6392fa 100644 --- a/MUON/AliMUONScalerEventTrigger.h +++ b/MUON/AliMUONScalerEventTrigger.h @@ -56,10 +56,10 @@ public: UInt_t* GetDarcScalers() {return &fDarcL0R;} // get scaler length - const Int_t GetLocalScalerLength() const {return fgkLocalScalerLength;} - const Int_t GetRegScalerLength() const {return fgkRegScalerLength;} - const Int_t GetGlobalScalerLength() const {return fgkGlobalScalerLength;} - const Int_t GetDarcScalerLength() const {return fgkDarcScalerLength;} + Int_t GetLocalScalerLength() const {return fgkLocalScalerLength;} + Int_t GetRegScalerLength() const {return fgkRegScalerLength;} + Int_t GetGlobalScalerLength() const {return fgkGlobalScalerLength;} + Int_t GetDarcScalerLength() const {return fgkDarcScalerLength;} private: diff --git a/MUON/AliMUONSubEventTracker.h b/MUON/AliMUONSubEventTracker.h index eee1b1880db..08b1e1a6fc5 100644 --- a/MUON/AliMUONSubEventTracker.h +++ b/MUON/AliMUONSubEventTracker.h @@ -40,7 +40,7 @@ public: Bool_t IsSortable() const {return kTRUE;} Int_t Compare(const TObject *obj) const; - const Int_t GetHeaderLength() const {return fgkHeaderLength;} + Int_t GetHeaderLength() const {return fgkHeaderLength;} Int_t* GetAddress() {return &fTotalLength;} diff --git a/MUON/AliMUONSubEventTrigger.h b/MUON/AliMUONSubEventTrigger.h index a598c8f6ab1..2ed868965d2 100644 --- a/MUON/AliMUONSubEventTrigger.h +++ b/MUON/AliMUONSubEventTrigger.h @@ -44,7 +44,7 @@ public: void SetRegInput(UInt_t in, Int_t n) {fRegInput[n] = in;} void SetLocalData(UInt_t d, Int_t n) {fLocalData[n] = d;} - const Int_t GetRegHeaderLength() const {return fgkRegHeaderLength;} + Int_t GetRegHeaderLength() const {return fgkRegHeaderLength;} UInt_t* GetAddress() {return &fRegWord;} private: diff --git a/PHOS/AliPHOSCalibrationData.h b/PHOS/AliPHOSCalibrationData.h index 58a85a57f62..c7057d70ebb 100644 --- a/PHOS/AliPHOSCalibrationData.h +++ b/PHOS/AliPHOSCalibrationData.h @@ -31,7 +31,7 @@ public: virtual const char* GetSubsystem(void)const{return "PHOS" ;} virtual const char* GetVersion(void) const{return fVersion ;} virtual const char* GetCategory(void) const {return fCategory ;} - virtual const void GetValidityRange(Int_t &begin,Int_t &end) const {begin=fBegin;end=fEnd ;} + virtual void GetValidityRange(Int_t &begin,Int_t &end) const {begin=fBegin;end=fEnd ;} Float_t Data(Int_t channel)const ; Float_t DataCheck(Int_t channel) const ; diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h index 954a7ce5358..736363b4a08 100644 --- a/PHOS/AliPHOSFastRecParticle.h +++ b/PHOS/AliPHOSFastRecParticle.h @@ -40,9 +40,9 @@ class AliPHOSFastRecParticle : public TParticle { // returns the index of this in the list return fIndexInList ; } - virtual const Int_t GetNPrimaries() const {return 0 ;} + virtual Int_t GetNPrimaries() const {return 0 ;} virtual const TParticle * GetPrimary(Int_t) const {return 0 ;} - const Int_t GetType() const { + Int_t GetType() const { // returns the type of the particle return fType ; } diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx index 2145f8f57ad..80e2045c3a1 100644 --- a/PHOS/AliPHOSPIDv1.cxx +++ b/PHOS/AliPHOSPIDv1.cxx @@ -384,7 +384,7 @@ void AliPHOSPIDv1::Exec(Option_t *option) } //________________________________________________________________________ -const Double_t AliPHOSPIDv1::GausF(Double_t x, Double_t y, Double_t * par) +Double_t AliPHOSPIDv1::GausF(Double_t x, Double_t y, Double_t * par) { //Given the energy x and the parameter y (tof, shower dispersion or cpv-emc distance), //this method returns a density probability of this parameter, given by a gaussian @@ -403,7 +403,7 @@ const Double_t AliPHOSPIDv1::GausF(Double_t x, Double_t y, Double_t * par) } //________________________________________________________________________ -const Double_t AliPHOSPIDv1::GausPol2(Double_t x, Double_t y, Double_t * par) +Double_t AliPHOSPIDv1::GausPol2(Double_t x, Double_t y, Double_t * par) { //Given the energy x and the parameter y (tof, shower dispersion or cpv-emc distance), //this method returns a density probability of this parameter, given by a gaussian @@ -747,7 +747,7 @@ TVector3 AliPHOSPIDv1::GetMomentumDirection(AliPHOSEmcRecPoint * emc, AliPHOSCpv } //________________________________________________________________________ -const Double_t AliPHOSPIDv1::LandauF(Double_t x, Double_t y, Double_t * par) +Double_t AliPHOSPIDv1::LandauF(Double_t x, Double_t y, Double_t * par) { //Given the energy x and the parameter y (tof, shower dispersion or cpv-emc distance), //this method returns a density probability of this parameter, given by a landau @@ -765,7 +765,7 @@ const Double_t AliPHOSPIDv1::LandauF(Double_t x, Double_t y, Double_t * par) } //________________________________________________________________________ -const Double_t AliPHOSPIDv1::LandauPol2(Double_t x, Double_t y, Double_t * par) +Double_t AliPHOSPIDv1::LandauPol2(Double_t x, Double_t y, Double_t * par) { //Given the energy x and the parameter y (tof, shower dispersion or cpv-emc distance), diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h index ef2a5abcd5d..eb2c5d1a721 100644 --- a/PHOS/AliPHOSPIDv1.h +++ b/PHOS/AliPHOSPIDv1.h @@ -95,10 +95,10 @@ private: //Functions to calculate the PID probability // Double_t ChargedHadronDistProb(Double_t x, Double_t y, Double_t * parg, Double_t * parl) ; - const Double_t GausF (Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b/(x*x)+c/x - const Double_t GausPol2(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b*x+c*x*x - const Double_t LandauF(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b/(x*x)+c/x - const Double_t LandauPol2(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b*x+c*x*x + Double_t GausF (Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b/(x*x)+c/x + Double_t GausPol2(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b*x+c*x*x + Double_t LandauF(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b/(x*x)+c/x + Double_t LandauPol2(Double_t x, Double_t y, Double_t *par) ; //gaussian probability, parameter dependence a+b*x+c*x*x // Relative Distance CPV-EMC Float_t GetDistance (AliPHOSEmcRecPoint * emc, AliPHOSCpvRecPoint * cpv, Option_t * axis)const ; Int_t GetCPVBit (AliPHOSEmcRecPoint * emc, AliPHOSCpvRecPoint * cpv, Int_t EffPur, Float_t e) const; diff --git a/PHOS/AliPHOSRecParticle.cxx b/PHOS/AliPHOSRecParticle.cxx index 60dec667dde..0d2d7d59228 100644 --- a/PHOS/AliPHOSRecParticle.cxx +++ b/PHOS/AliPHOSRecParticle.cxx @@ -79,13 +79,13 @@ } //____________________________________________________________________________ -const Int_t AliPHOSRecParticle::GetNPrimaries() const +Int_t AliPHOSRecParticle::GetNPrimaries() const { return -1; } //____________________________________________________________________________ -const Int_t AliPHOSRecParticle::GetNPrimariesToRecParticles() const +Int_t AliPHOSRecParticle::GetNPrimariesToRecParticles() const { // Get the number of primaries at the origine of the RecParticle Int_t rv = 0 ; diff --git a/PHOS/AliPHOSRecParticle.h b/PHOS/AliPHOSRecParticle.h index 1d603ce3aab..8fb07df141b 100644 --- a/PHOS/AliPHOSRecParticle.h +++ b/PHOS/AliPHOSRecParticle.h @@ -31,8 +31,8 @@ class AliPHOSRecParticle : public AliPHOSFastRecParticle { virtual ~AliPHOSRecParticle(){ } Int_t GetPHOSTSIndex()const { return fPHOSTrackSegment ; } - virtual const Int_t GetNPrimariesToRecParticles() const ; - virtual const Int_t GetNPrimaries() const ; + virtual Int_t GetNPrimariesToRecParticles() const ; + virtual Int_t GetNPrimaries() const ; TVector3 GetPos() const { return fPos ; } virtual const TParticle * GetPrimary(Int_t index) const ; virtual const TParticle * GetPrimary() const ; diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h index f45046fe6a1..ad0e7c50a6b 100644 --- a/PHOS/AliPHOSSDigitizer.h +++ b/PHOS/AliPHOSSDigitizer.h @@ -33,7 +33,7 @@ public: Float_t Calibrate(Int_t amp)const {return (amp - fA)/fB ; } Int_t Digitize(Float_t Energy)const { return (Int_t ) ( fA + Energy*fB); } virtual void Exec(Option_t *option); - const Int_t GetSDigitsInRun() const {return fSDigitsInRun ;} + Int_t GetSDigitsInRun() const {return fSDigitsInRun ;} virtual void Print() const ; void SetEventFolderName(TString name) { fEventFolderName = name ; } void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index fb40764ad7b..8a5a5cc56fe 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -36,7 +36,7 @@ public: AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : TTask(tsmaker) { ; } virtual ~ AliPHOSTrackSegmentMaker() ; - virtual const Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } + virtual Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } virtual void Print()const {Warning("Print", "Not Defined" ) ; } void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.h b/PHOS/AliPHOSTrackSegmentMakerv1.h index db286dd4946..cf1322d4894 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.h +++ b/PHOS/AliPHOSTrackSegmentMakerv1.h @@ -38,7 +38,7 @@ public: // virtual char* GetRecPointsBranch (void)const{return (char*)fRecPointsBranchTitle.Data() ;} // virtual char* GetTrackSegmentsBranch(void)const{return (char*)fTrackSegmentsBranchTitle.Data() ;} - virtual const Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;} + virtual Int_t GetTrackSegmentsInRun()const {return fTrackSegmentsInRun ;} virtual void Exec(Option_t *option); // Does the job void FillOneModule() ; // Finds range in which RecPoints belonging current PHOS module are diff --git a/RAW/AliMDC.h b/RAW/AliMDC.h index 2b86730b5af..5444985b9a3 100644 --- a/RAW/AliMDC.h +++ b/RAW/AliMDC.h @@ -51,15 +51,15 @@ public: enum {kMDC = 6}; // Which MDC is this... - static const char* const Fifo() {return fgkFifo;} - static const char* const RawDBFS(Int_t i) {return fgkRawDBFS[i];} - static const char* const TagDBFS() {return fgkTagDBFS;} - static const char* const RunDBFS() {return fgkRunDBFS;} - static const char* const RFIOFS() {return fgkRFIOFS;} - static const char* const CastorFS() {return fgkCastorFS;} - static const char* const RootdFS() {return fgkRootdFS;} - static const char* const AlienHost() {return fgkAlienHost;} - static const char* const AlienDir() {return fgkAlienDir;} + static const char* Fifo() {return fgkFifo;} + static const char* RawDBFS(Int_t i) {return fgkRawDBFS[i];} + static const char* TagDBFS() {return fgkTagDBFS;} + static const char* RunDBFS() {return fgkRunDBFS;} + static const char* RFIOFS() {return fgkRFIOFS;} + static const char* CastorFS() {return fgkCastorFS;} + static const char* RootdFS() {return fgkRootdFS;} + static const char* AlienHost() {return fgkAlienHost;} + static const char* AlienDir() {return fgkAlienDir;} private: class AliMDCInterruptHandler : public TSignalHandler { -- 2.43.5