From 1240edf52b298cfdce5a984cdb4c144b1515be50 Mon Sep 17 00:00:00 2001 From: morsch Date: Sun, 6 Mar 2011 14:24:54 +0000 Subject: [PATCH] Coding rule violations corrected --- JETAN/AliAnalysisTaskJetCluster.cxx | 1 + JETAN/AliAnalysisTaskJets.cxx | 1 + JETAN/AliDAJetFinder.cxx | 5 ++- JETAN/AliDAJetFinder.h | 2 +- JETAN/AliEventShape.cxx | 2 +- JETAN/AliFastJetHeader.h | 8 ++--- JETAN/AliFastJetHeaderV1.h | 10 +++--- JETAN/AliFastJetInput.cxx | 2 +- JETAN/AliFastJetInput.h | 3 +- JETAN/AliJetAODFillUnitArrayEMCalDigits.cxx | 2 +- JETAN/AliJetAODReaderHeader.h | 2 +- JETAN/AliJetBkg.cxx | 8 ++--- JETAN/AliJetBkg.h | 2 +- JETAN/AliJetDummyGeo.cxx | 2 +- JETAN/AliJetDummyGeo.h | 2 +- JETAN/AliJetDummyShishKebabTrd1Module.h | 36 ++++++++++++--------- JETAN/AliJetFinder.cxx | 2 +- JETAN/AliJetFinder.h | 2 +- JETAN/AliJetHadronCorrectionv0.cxx | 1 + JETAN/AliJetHadronCorrectionv0.h | 14 ++++---- JETAN/AliJetHadronCorrectionv1.cxx | 5 +-- JETAN/AliJetHadronCorrectionv1.h | 6 ++-- JETAN/AliJetHistos.cxx | 4 ++- JETAN/AliJetKineReaderHeader.h | 6 ++-- JETAN/AliJetProductionData.h | 2 +- JETAN/AliJetReaderHeader.h | 2 +- JETAN/AliJetSelector.h | 2 +- JETAN/AliJetUnitArray.cxx | 6 ++-- JETAN/AliJetUnitArray.h | 6 ++-- JETAN/AliKMeansClustering.cxx | 8 ++--- JETAN/AliKMeansClustering.h | 10 +++--- JETAN/AliUA1JetFinderV2.cxx | 4 +-- JETAN/AliUA1JetFinderV2.h | 4 +-- 33 files changed, 92 insertions(+), 80 deletions(-) diff --git a/JETAN/AliAnalysisTaskJetCluster.cxx b/JETAN/AliAnalysisTaskJetCluster.cxx index 8b350289fd1..2265781b567 100644 --- a/JETAN/AliAnalysisTaskJetCluster.cxx +++ b/JETAN/AliAnalysisTaskJetCluster.cxx @@ -45,6 +45,7 @@ #include "AliESDEvent.h" #include "AliAODEvent.h" #include "AliAODHandler.h" +#include "AliAODExtension.h" #include "AliAODTrack.h" #include "AliAODJet.h" #include "AliAODMCParticle.h" diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx index f15db3750fe..bf4cbbceba4 100644 --- a/JETAN/AliAnalysisTaskJets.cxx +++ b/JETAN/AliAnalysisTaskJets.cxx @@ -35,6 +35,7 @@ #include "AliAODEvent.h" #include "AliAODJetEventBackground.h" #include "AliAODHandler.h" +#include "AliAODExtension.h" #include "AliMCEventHandler.h" #include "AliESDInputHandler.h" #include "AliMCEvent.h" diff --git a/JETAN/AliDAJetFinder.cxx b/JETAN/AliDAJetFinder.cxx index ee945e82775..e27ee30c1c6 100644 --- a/JETAN/AliDAJetFinder.cxx +++ b/JETAN/AliDAJetFinder.cxx @@ -156,8 +156,9 @@ void AliDAJetFinder::InitDetAnn(Double_t &dEtSum,Double_t **xData,TVectorD *vPx, } //----------------------------------------------------------------------------------- -void AliDAJetFinder::DoubleClusters(Int_t nc,Int_t &nk, TVectorD *vPy, TMatrixD *mY) const +void AliDAJetFinder::DoubleClusters(Int_t nc,Int_t &nk, TVectorD *vPy, TMatrixD *mY) const { +// Return double clusters for(Int_t iClust=0; iClust ptmin diff --git a/JETAN/AliFastJetHeaderV1.h b/JETAN/AliFastJetHeaderV1.h index dab38253467..d8f78596239 100644 --- a/JETAN/AliFastJetHeaderV1.h +++ b/JETAN/AliFastJetHeaderV1.h @@ -69,19 +69,19 @@ class AliFastJetHeaderV1 : public AliJetHeader protected: //fastjet::JetDefinition parameters - Double_t fRparam; + Double_t fRparam; // R param Double_t fRparamBkg;//R param for bkg calculation fastjet::JetAlgorithm fAlgorithm; //fastjet::kt_algorithm fastjet::Strategy fStrategy; //= fastjet::Best; fastjet::RecombinationScheme fRecombScheme; // = fastjet::BIpt_scheme; //fastjet::GhostedAreaSpec parameters - Double_t fGhostEtaMax; - Double_t fGhostArea; - Int_t fActiveAreaRepeats; + Double_t fGhostEtaMax; // Max eta for ghosts + Double_t fGhostArea; // Ghost area + Int_t fActiveAreaRepeats; // Active are repetitions //fastjet::AreaDefinition parameters - fastjet::AreaType fAreaType; + fastjet::AreaType fAreaType; // area types //fastjet::ClusterSequenceArea options parameters Double_t fPtMin; //jets with pt > ptmin diff --git a/JETAN/AliFastJetInput.cxx b/JETAN/AliFastJetInput.cxx index d075d11f5b0..6814f98eaa5 100644 --- a/JETAN/AliFastJetInput.cxx +++ b/JETAN/AliFastJetInput.cxx @@ -189,7 +189,7 @@ Float_t AliFastJetInput::EtaToTheta(Float_t arg) } -Double_t AliFastJetInput::Thermalspectrum(Double_t *x, Double_t *par){ +Double_t AliFastJetInput::Thermalspectrum(const Double_t *x, const Double_t *par){ return x[0]*TMath::Exp(-x[0]/par[0]); diff --git a/JETAN/AliFastJetInput.h b/JETAN/AliFastJetInput.h index 17d70af3d40..4049b0cc3ad 100644 --- a/JETAN/AliFastJetInput.h +++ b/JETAN/AliFastJetInput.h @@ -42,9 +42,8 @@ class AliFastJetInput : public TObject void FillInput(); vector GetInputParticles() const {return fInputParticles;} vector GetInputParticlesCh() const {return fInputParticlesCh;} - Float_t EtaToTheta(Float_t arg); - static Double_t Thermalspectrum(Double_t *x, Double_t *par); + static Double_t Thermalspectrum(const Double_t *x, const Double_t *par); private: AliJetReader *fReader; //! reader diff --git a/JETAN/AliJetAODFillUnitArrayEMCalDigits.cxx b/JETAN/AliJetAODFillUnitArrayEMCalDigits.cxx index 869d7c041a0..43fb9301da9 100755 --- a/JETAN/AliJetAODFillUnitArrayEMCalDigits.cxx +++ b/JETAN/AliJetAODFillUnitArrayEMCalDigits.cxx @@ -386,7 +386,7 @@ void AliJetAODFillUnitArrayEMCalDigits::Exec(Option_t* const /*option*/) //____________________________________________________________________________ void AliJetAODFillUnitArrayEMCalDigits::GetTracksPointingToCell(TArrayS* array,Double_t eta, Double_t phi, Double_t cut) { - +// Get all tracks pointing to cell int size=0; for (Int_t itrk = 0; itrk < fAOD->GetNumberOfTracks() ; itrk++) { //track loop diff --git a/JETAN/AliJetAODReaderHeader.h b/JETAN/AliJetAODReaderHeader.h index 169d08903c3..60cc6376a89 100644 --- a/JETAN/AliJetAODReaderHeader.h +++ b/JETAN/AliJetAODReaderHeader.h @@ -22,7 +22,7 @@ class AliJetAODReaderHeader : public AliJetReaderHeader // Getters Int_t GetNaod() const {return fNaod;} - UInt_t GetTestFilterMask(){return fTestFilterMask;} + UInt_t GetTestFilterMask() const {return fTestFilterMask;} TString GetNonStdBranch() const { return fNonStdBranch; } Bool_t GetReadStdBranch() const { return (fReadBranches & kReadStdBranch); } Bool_t GetReadNonStdBranch() const { return (fReadBranches & kReadNonStdBranch); } diff --git a/JETAN/AliJetBkg.cxx b/JETAN/AliJetBkg.cxx index 69185cb7158..ad3c944aee1 100644 --- a/JETAN/AliJetBkg.cxx +++ b/JETAN/AliJetBkg.cxx @@ -291,7 +291,7 @@ meanareab, false); //___________________________________________________________________ Float_t AliJetBkg::BkgFastJet(){ - +// Return background AliFastJetHeaderV1 *header = (AliFastJetHeaderV1*)fHeader; Bool_t debug = header->GetDebug(); // debug option @@ -313,7 +313,7 @@ Float_t AliJetBkg::BkgFastJet(){ } //___________________________________________________________________ Float_t AliJetBkg::BkgChargedFastJet(){ - +// Background for charged jets AliFastJetHeaderV1 *header = (AliFastJetHeaderV1*)fHeader; Bool_t debug = header->GetDebug(); // debug option @@ -593,8 +593,8 @@ Double_t AliJetBkg::BkgFunction(Double_t */*x*/,Double_t */*par*/){ } -Bool_t AliJetBkg::EmcalAcceptance(const Float_t eta, const Float_t phi, const Float_t radius){ - +Bool_t AliJetBkg::EmcalAcceptance(const Float_t eta, const Float_t phi, const Float_t radius) const{ +// Apply emcal acceptance cuts Float_t meanPhi=190./180.*TMath::Pi()-110./180.*TMath::Pi()/2; Float_t deltaphi=110./180.*TMath::Pi(); Float_t phicut=deltaphi/2.-radius; diff --git a/JETAN/AliJetBkg.h b/JETAN/AliJetBkg.h index b901e37343d..3764ace2465 100644 --- a/JETAN/AliJetBkg.h +++ b/JETAN/AliJetBkg.h @@ -40,7 +40,7 @@ class AliJetBkg : public TObject // Float_t BkgRemoveJetLeading(TClonesArray* fAODJets); Float_t BkgRemoveJetLeadingFromUArray(TClonesArray* fAODJets); Float_t EtaToTheta(Float_t arg); - Bool_t EmcalAcceptance(const Float_t eta, const Float_t phi, const Float_t radius); + Bool_t EmcalAcceptance(const Float_t eta, const Float_t phi, const Float_t radius) const; static Double_t BkgFunction(Double_t *x,Double_t *par); private: diff --git a/JETAN/AliJetDummyGeo.cxx b/JETAN/AliJetDummyGeo.cxx index 052cb224006..2892cbc1fcc 100644 --- a/JETAN/AliJetDummyGeo.cxx +++ b/JETAN/AliJetDummyGeo.cxx @@ -280,7 +280,7 @@ AliJetDummyGeo::~AliJetDummyGeo() } //------------------------------------------------------------------------------------ -void AliJetDummyGeo::EtaPhiFromIndex(Int_t absId, Float_t& eta, Float_t& phi) +void AliJetDummyGeo::EtaPhiFromIndex(Int_t absId, Float_t& eta, Float_t& phi) const { // Nov 16, 2006- float to double // version for TRD1 only diff --git a/JETAN/AliJetDummyGeo.h b/JETAN/AliJetDummyGeo.h index ab5660d447a..418846ae8bc 100644 --- a/JETAN/AliJetDummyGeo.h +++ b/JETAN/AliJetDummyGeo.h @@ -53,7 +53,7 @@ class AliJetDummyGeo : public TObject Float_t GetArm1PhiMin() const {return fArm1PhiMin;} Float_t GetArm1PhiMax() const {return fArm1PhiMax;} Float_t GetIPDistance() const {return fIPDistance;} - void EtaPhiFromIndex(Int_t id, Float_t& eta, Float_t& phi); + void EtaPhiFromIndex(Int_t id, Float_t& eta, Float_t& phi) const; void GetGlobal(const Double_t *loc, Double_t *glob, Int_t ind) const; void GetGlobal(Int_t absId, Double_t glob[3]) const; void GetGlobal(Int_t absId, TVector3 &vglob) const; diff --git a/JETAN/AliJetDummyShishKebabTrd1Module.h b/JETAN/AliJetDummyShishKebabTrd1Module.h index 098065edce5..b7b42b45ad6 100644 --- a/JETAN/AliJetDummyShishKebabTrd1Module.h +++ b/JETAN/AliJetDummyShishKebabTrd1Module.h @@ -61,22 +61,8 @@ class AliJetDummyShishKebabTrd1Module : public TNamed { } else {xr = fOK1.Y(); zr = fOK1.X(); } } - void GetCenterOfCellInLocalCoordinateofSM3X3(Int_t ieta, Double_t &xr, Double_t &zr) const - { - // Center of cell - // 3X3 case - Nov 9,2006 - ieta = ieta<0? 0 : ieta; // check index - ieta = ieta>2? 2 : ieta; - xr = fOK3X3[2-ieta].Y(); - zr = fOK3X3[2-ieta].X(); - } - void GetCenterOfCellInLocalCoordinateofSM1X1(Double_t &xr, Double_t &zr) const - { - // 1X1 case - Nov 27,2006 - // Center of cell is center of module - xr = fOK.Y() - fgr; - zr = fOK.X(); - } + void GetCenterOfCellInLocalCoordinateofSM3X3(Int_t ieta, Double_t &xr, Double_t &zr) const; + void GetCenterOfCellInLocalCoordinateofSM1X1(Double_t &xr, Double_t &zr) const; // 15-may-06 TVector2& GetCenterOfModuleFace() {return fOB;} TVector2& GetCenterOfModuleFace(Int_t ieta) { @@ -122,5 +108,23 @@ class AliJetDummyShishKebabTrd1Module : public TNamed { Int_t fDebug; // debug flag ClassDef(AliJetDummyShishKebabTrd1Module,1) // TRD1 Shish-Kebab module }; +inline + void AliJetDummyShishKebabTrd1Module::GetCenterOfCellInLocalCoordinateofSM3X3(Int_t ieta, Double_t &xr, Double_t &zr) const + { + // Center of cell + // 3X3 case - Nov 9,2006 + ieta = ieta<0? 0 : ieta; // check index + ieta = ieta>2? 2 : ieta; + xr = fOK3X3[2-ieta].Y(); + zr = fOK3X3[2-ieta].X(); + } +inline + void AliJetDummyShishKebabTrd1Module::GetCenterOfCellInLocalCoordinateofSM1X1(Double_t &xr, Double_t &zr) const + { + // 1X1 case - Nov 27,2006 + // Center of cell is center of module + xr = fOK.Y() - fgr; + zr = fOK.X(); + } #endif diff --git a/JETAN/AliJetFinder.cxx b/JETAN/AliJetFinder.cxx index bdad6045e35..07322fb195d 100644 --- a/JETAN/AliJetFinder.cxx +++ b/JETAN/AliJetFinder.cxx @@ -157,7 +157,7 @@ void AliJetFinder::AddJet(AliAODJet p) new ((*fAODjets)[fNAODjets++]) AliAODJet(p); } -void AliJetFinder::ConnectAOD(AliAODEvent* aod) +void AliJetFinder::ConnectAOD(const AliAODEvent* aod) { // Connect to the AOD fAODjets = aod->GetJets(); diff --git a/JETAN/AliJetFinder.h b/JETAN/AliJetFinder.h index b8d70d4bb84..199c74ce375 100755 --- a/JETAN/AliJetFinder.h +++ b/JETAN/AliJetFinder.h @@ -55,7 +55,7 @@ class AliJetFinder : public TObject virtual Bool_t ProcessEvent(); virtual Bool_t ProcessEvent2(); virtual void ConnectTree(TTree* tree, TObject* data); - virtual void ConnectAOD(AliAODEvent* aod); + virtual void ConnectAOD(const AliAODEvent* aod); virtual void ConnectAODNonStd(AliAODEvent* aod,const char* bname); virtual void WriteHeaders(); diff --git a/JETAN/AliJetHadronCorrectionv0.cxx b/JETAN/AliJetHadronCorrectionv0.cxx index e9bf54963ce..7c25bebf632 100644 --- a/JETAN/AliJetHadronCorrectionv0.cxx +++ b/JETAN/AliJetHadronCorrectionv0.cxx @@ -61,6 +61,7 @@ AliJetHadronCorrectionv0::Instance() Double_t AliJetHadronCorrectionv0::GetEnergy(Double_t pmom, Double_t eta, Int_t /*gid*/) { +// Get energy for momentum pmom and pseudorapidity eta Int_t iEta=0; // index Double_t etaw = TMath::Abs(eta); if(etaw > etaGrid[maxVariant-1]) etaw = etaGrid[maxVariant-1]; diff --git a/JETAN/AliJetHadronCorrectionv0.h b/JETAN/AliJetHadronCorrectionv0.h index d8a3001d1bd..5de3834637f 100644 --- a/JETAN/AliJetHadronCorrectionv0.h +++ b/JETAN/AliJetHadronCorrectionv0.h @@ -12,19 +12,19 @@ class AliJetHadronCorrectionv0: public AliJetHadronCorrection { - private: - static AliJetHadronCorrectionv0* fHadrCorr; + public: + static AliJetHadronCorrectionv0* Instance(); + virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid); + Double_t GetEnergy(Double_t pmom, Double_t eta){return GetEnergy(pmom,eta,7);} + virtual ~AliJetHadronCorrectionv0() {} protected: AliJetHadronCorrectionv0() {;} AliJetHadronCorrectionv0(const char *name, const char *title); - public: - static AliJetHadronCorrectionv0* Instance(); - virtual Double_t GetEnergy(Double_t pmom, Double_t eta, Int_t gid); - Double_t GetEnergy(Double_t pmom, Double_t eta){return GetEnergy(pmom,eta,7);} - virtual ~AliJetHadronCorrectionv0() {} + private: + static AliJetHadronCorrectionv0* fHadrCorr; // pointer to instance ClassDef(AliJetHadronCorrectionv0,1) // Hadron correction for EMC (version for MDC) }; diff --git a/JETAN/AliJetHadronCorrectionv1.cxx b/JETAN/AliJetHadronCorrectionv1.cxx index d72dd72eb8e..c0f88749a25 100644 --- a/JETAN/AliJetHadronCorrectionv1.cxx +++ b/JETAN/AliJetHadronCorrectionv1.cxx @@ -63,7 +63,7 @@ AliJetHadronCorrectionv1::Instance() return fgHadrCorr; } -void AliJetHadronCorrectionv1::SetGeometry2(AliJetDummyGeo *geometry) +void AliJetHadronCorrectionv1::SetGeometry2(const AliJetDummyGeo *geometry) { // Initialise EMCAL geometry if (!geometry) @@ -168,8 +168,9 @@ Double_t AliJetHadronCorrectionv1::GetEnergy(Double_t pmom, Double_t eta, Int_t } -void AliJetHadronCorrectionv1::TrackPositionEMCal(AliAODTrack* track,Double_t &eta, Double_t &phi) +void AliJetHadronCorrectionv1::TrackPositionEMCal(const AliAODTrack* track,Double_t &eta, Double_t &phi) { +// Return track position on EMCal AliAODPid* pid = (AliAODPid*) track->GetDetPid(); if(pid) { diff --git a/JETAN/AliJetHadronCorrectionv1.h b/JETAN/AliJetHadronCorrectionv1.h index 643425a891c..b21068561aa 100644 --- a/JETAN/AliJetHadronCorrectionv1.h +++ b/JETAN/AliJetHadronCorrectionv1.h @@ -23,8 +23,8 @@ class AliJetHadronCorrectionv1 : public AliJetHadronCorrection Double_t GetEnergy(Double_t pmom, Double_t eta){return GetEnergy(pmom,eta,7);} void SetGeometry(TString name, Double_t fs = 1.); - void SetGeometry2(AliJetDummyGeo *geometry); - void TrackPositionEMCal(AliAODTrack* track,Double_t &eta, Double_t &phi); + void SetGeometry2(const AliJetDummyGeo *geometry); + void TrackPositionEMCal(const AliAODTrack* track,Double_t &eta, Double_t &phi); protected: AliJetHadronCorrectionv1():fSamplingFraction(0) {for (Int_t i = 0; i < 8; i++) fPar[i] = 0.;} @@ -35,7 +35,7 @@ class AliJetHadronCorrectionv1 : public AliJetHadronCorrection static AliJetHadronCorrectionv1* fgHadrCorr; // Pointer to global instance (singleton) static Double_t fgParLookup[HCPARAMETERS][HCPARAMETERSETS]; // Global array with parameters for hadronic response - Double_t fPar[8]; + Double_t fPar[8]; // Parameters Float_t fSamplingFraction; // Sampling fraction ClassDef(AliJetHadronCorrectionv1,2) // Hadron correction for EMC (version for MDC) diff --git a/JETAN/AliJetHistos.cxx b/JETAN/AliJetHistos.cxx index 4e794ead488..448b22e227d 100644 --- a/JETAN/AliJetHistos.cxx +++ b/JETAN/AliJetHistos.cxx @@ -54,6 +54,7 @@ AliJetHistos::AliJetHistos(): AliJetHistos::~AliJetHistos() { +// Destructor delete fNJetsH; delete fPtH; delete fEtaH; @@ -74,6 +75,7 @@ void AliJetHistos::SetProperties(TH1* h,const char* x, const char* y) const void AliJetHistos::AddHistosToList(TList *list) { +// Add histos to the list list->Add(fNJetsH); list->Add(fPtH); list->Add(fEtaH); @@ -84,7 +86,7 @@ void AliJetHistos::AddHistosToList(TList *list) void AliJetHistos::FillHistos(TClonesArray *jets) { - +// Fill histograms if(!jets)return; Int_t nj = jets->GetEntries(); fNJetsH->Fill(nj,1); diff --git a/JETAN/AliJetKineReaderHeader.h b/JETAN/AliJetKineReaderHeader.h index ff4c13c1420..8f602884855 100644 --- a/JETAN/AliJetKineReaderHeader.h +++ b/JETAN/AliJetKineReaderHeader.h @@ -30,9 +30,9 @@ class AliJetKineReaderHeader : public AliJetReaderHeader protected: //parameters set by user - Bool_t fFastSimTPC; - Bool_t fFastSimEMCAL; - Bool_t fChargedOnly; + Bool_t fFastSimTPC; // TPC fast simulation flag + Bool_t fFastSimEMCAL; // EMCAL fast simulation flag + Bool_t fChargedOnly; // Charged particle only flag ClassDef(AliJetKineReaderHeader,2); }; diff --git a/JETAN/AliJetProductionData.h b/JETAN/AliJetProductionData.h index 9bc9bc79462..5a1ceae2833 100644 --- a/JETAN/AliJetProductionData.h +++ b/JETAN/AliJetProductionData.h @@ -23,7 +23,7 @@ class AliJetProductionData : public TObject void GetPtHardLimits(Int_t bin, Float_t& ptmin, Float_t& ptmax); TString GetRunTitle(Int_t bin); Float_t GetWeight(Int_t bin); - + protected: Int_t fNbins; // Number of pt_hard bins used in the production Float_t* fPtHardLimits; //[fNbins+1] Float_t* fWeights; //[fNbins] diff --git a/JETAN/AliJetReaderHeader.h b/JETAN/AliJetReaderHeader.h index c6093df46e0..0d4a4609eb0 100755 --- a/JETAN/AliJetReaderHeader.h +++ b/JETAN/AliJetReaderHeader.h @@ -72,7 +72,7 @@ class AliJetReaderHeader : public TNamed Int_t fCluster; // cluster type Int_t fDebug; // debug option Bool_t fDZ; // include dead zones or not - Int_t fSignalPerBg; + Int_t fSignalPerBg; // Signal per Background Float_t fFiducialEtaMin; // Fiducial minimum eta Float_t fFiducialEtaMax; // Fiducial maximum eta Float_t fFiducialPhiMin; // Fiducial minimum phi diff --git a/JETAN/AliJetSelector.h b/JETAN/AliJetSelector.h index 1009bf75faa..fca4fba85a9 100644 --- a/JETAN/AliJetSelector.h +++ b/JETAN/AliJetSelector.h @@ -35,7 +35,7 @@ class AliJetSelector : public TSelector virtual void Terminate(); protected: - AliJetFinder* fJetFinder; + AliJetFinder* fJetFinder; // Pointer to jet finder ClassDef(AliJetSelector, 1) }; diff --git a/JETAN/AliJetUnitArray.cxx b/JETAN/AliJetUnitArray.cxx index 77d28f3c8f0..cdad53b76ad 100644 --- a/JETAN/AliJetUnitArray.cxx +++ b/JETAN/AliJetUnitArray.cxx @@ -254,7 +254,7 @@ Float_t AliJetUnitArray::EtaToTheta(Float_t arg) const } //------------------------------------------------------------------------ -Bool_t AliJetUnitArray::operator>(AliJetUnitArray* unit) const +Bool_t AliJetUnitArray::operator>(const AliJetUnitArray* unit) const { // Greater than operator used by sort if( fUnitEnergy > unit->GetUnitEnergy()) @@ -264,7 +264,7 @@ Bool_t AliJetUnitArray::operator>(AliJetUnitArray* unit) const } //------------------------------------------------------------------------ -Bool_t AliJetUnitArray::operator<( AliJetUnitArray* unit) const +Bool_t AliJetUnitArray::operator<(const AliJetUnitArray* unit) const { // Less than operator used by sort if( fUnitEnergy < unit->GetUnitEnergy()) @@ -274,7 +274,7 @@ Bool_t AliJetUnitArray::operator<( AliJetUnitArray* unit) const } //------------------------------------------------------------------------ -Bool_t AliJetUnitArray::operator==( AliJetUnitArray* unit) const +Bool_t AliJetUnitArray::operator==(const AliJetUnitArray* unit) const { // equality operator used by sort if( fUnitEnergy == unit->GetUnitEnergy()) diff --git a/JETAN/AliJetUnitArray.h b/JETAN/AliJetUnitArray.h index 804e377abbc..98b6ae5405c 100644 --- a/JETAN/AliJetUnitArray.h +++ b/JETAN/AliJetUnitArray.h @@ -131,9 +131,9 @@ class AliJetUnitArray : public TObject protected: AliJetUnitArray(const AliJetUnitArray& rUnit); AliJetUnitArray& operator = (const AliJetUnitArray& rhs); - Bool_t operator> ( AliJetUnitArray* unit1) const; - Bool_t operator< ( AliJetUnitArray* unit1) const; - Bool_t operator== ( AliJetUnitArray* unit1) const; + Bool_t operator> (const AliJetUnitArray* unit1) const; + Bool_t operator< (const AliJetUnitArray* unit1) const; + Bool_t operator== (const AliJetUnitArray* unit1) const; Float_t fUnitEnergy; // Energy (Pt,et) of the unit Float_t fUnitEta; // Eta of the unit diff --git a/JETAN/AliKMeansClustering.cxx b/JETAN/AliKMeansClustering.cxx index f23ec64b323..b32643344b1 100755 --- a/JETAN/AliKMeansClustering.cxx +++ b/JETAN/AliKMeansClustering.cxx @@ -32,7 +32,7 @@ ClassImp(AliKMeansClustering) Double_t AliKMeansClustering::fBeta = 10.; -Int_t AliKMeansClustering::SoftKMeans(Int_t k, Int_t n, Double_t* x, Double_t* y, Double_t* mx, Double_t* my , Double_t* rk ) +Int_t AliKMeansClustering::SoftKMeans(Int_t k, Int_t n, const Double_t* x, const Double_t* y, Double_t* mx, Double_t* my , Double_t* rk ) { // // The soft K-means algorithm @@ -397,7 +397,7 @@ Double_t AliKMeansClustering::d(Double_t mx, Double_t my, Double_t x, Double_t y -void AliKMeansClustering::OptimalInit(Int_t k, Int_t n, Double_t* x, Double_t* y, Double_t* mx, Double_t* my) +void AliKMeansClustering::OptimalInit(Int_t k, Int_t n, const Double_t* x, const Double_t* y, Double_t* mx, Double_t* my) { // // Optimal initialisation using the k-means++ algorithm @@ -520,7 +520,7 @@ void AliKMeansResult::Sort() TMath::Sort(fK, fTarget, fInd); } -void AliKMeansResult::Sort(Int_t n, Double_t* x, Double_t* y) +void AliKMeansResult::Sort(Int_t n, const Double_t* x, const Double_t* y) { // Build target array and sort for (Int_t i = 0; i < fK; i++) @@ -541,7 +541,7 @@ void AliKMeansResult::Sort(Int_t n, Double_t* x, Double_t* y) TMath::Sort(fK, fTarget, fInd); } -void AliKMeansResult::CopyResults(AliKMeansResult* res) +void AliKMeansResult::CopyResults(const AliKMeansResult* res) { fK = res->GetK(); for (Int_t i = 0; i