From 80acde99cbe370205ba0fad976bf8e4bdfd27c0a Mon Sep 17 00:00:00 2001 From: mvl Date: Sat, 11 Jan 2014 10:55:41 +0100 Subject: [PATCH] Remove Coverity warnings on constness (from Oliver) --- .../AliAnalysisTaskFragmentationFunction.cxx | 27 ++++++++----------- PWGJE/AliAnalysisTaskFragmentationFunction.h | 7 ++--- PWGJE/AliFragmentationFunctionCorrections.cxx | 2 +- PWGJE/AliFragmentationFunctionCorrections.h | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/PWGJE/AliAnalysisTaskFragmentationFunction.cxx b/PWGJE/AliAnalysisTaskFragmentationFunction.cxx index 8d0663f618b..1ed33b596a5 100644 --- a/PWGJE/AliAnalysisTaskFragmentationFunction.cxx +++ b/PWGJE/AliAnalysisTaskFragmentationFunction.cxx @@ -2703,7 +2703,6 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) TList* perpjettracklistGen1 = new TList(); TList* perpjettracklistGen2 = new TList(); - Double_t sumPtGenPerp = 0.; Double_t sumPtGenPerp1 = 0.; Double_t sumPtGenPerp2 = 0.; GetTracksTiltedwrpJetAxis(TMath::Pi()/2.,fTracksAODMCCharged, perpjettracklistGen1, jet, TMath::Abs(GetFFRadius()) , sumPtGenPerp1); @@ -2711,36 +2710,31 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *) perpjettracklistGen->AddAll(perpjettracklistGen1); perpjettracklistGen->AddAll(perpjettracklistGen2); - sumPtGenPerp = 0.5*(sumPtGenPerp1+sumPtGenPerp2); TList* perpjettracklistGenSecNS = new TList(); TList* perpjettracklistGenSecNS1 = new TList(); TList* perpjettracklistGenSecNS2 = new TList(); - Double_t sumPtGenPerpNS; - Double_t sumPtGenPerpNS1; - Double_t sumPtGenPerpNS2; + Double_t sumPtGenPerpNS1 = 0; + Double_t sumPtGenPerpNS2 = 0; GetTracksTiltedwrpJetAxis(TMath::Pi()/2.,fTracksAODMCChargedSecNS, perpjettracklistGenSecNS1, jet, TMath::Abs(GetFFRadius()) , sumPtGenPerpNS1); GetTracksTiltedwrpJetAxis(-1*TMath::Pi()/2.,fTracksAODMCChargedSecNS, perpjettracklistGenSecNS2, jet, TMath::Abs(GetFFRadius()) , sumPtGenPerpNS2); perpjettracklistGenSecNS->AddAll(perpjettracklistGenSecNS1); perpjettracklistGenSecNS->AddAll(perpjettracklistGenSecNS2); - sumPtGenPerpNS = 0.5*(sumPtGenPerpNS1+sumPtGenPerpNS2); TList* perpjettracklistGenSecS = new TList(); TList* perpjettracklistGenSecS1 = new TList(); TList* perpjettracklistGenSecS2 = new TList(); - Double_t sumPtGenPerpS; - Double_t sumPtGenPerpS1; - Double_t sumPtGenPerpS2; + Double_t sumPtGenPerpS1 = 0; + Double_t sumPtGenPerpS2 = 0; GetTracksTiltedwrpJetAxis(TMath::Pi()/2.,fTracksAODMCChargedSecS, perpjettracklistGenSecS1, jet, TMath::Abs(GetFFRadius()) , sumPtGenPerpS1); GetTracksTiltedwrpJetAxis(-1*TMath::Pi()/2.,fTracksAODMCChargedSecS, perpjettracklistGenSecS2, jet, TMath::Abs(GetFFRadius()) , sumPtGenPerpS2); perpjettracklistGenSecS->AddAll(perpjettracklistGenSecS1); perpjettracklistGenSecS->AddAll(perpjettracklistGenSecS2); - sumPtGenPerpS = 0.5*(sumPtGenPerpS1+sumPtGenPerpS2); if(perpjettracklistGen->GetSize() != perpjettracklistGen1->GetSize() + perpjettracklistGen2->GetSize()){ @@ -3274,7 +3268,7 @@ void AliAnalysisTaskFragmentationFunction::SetProperties(TH1* h,const char* x, c // ________________________________________________________________________________________________________________________________________________________ void AliAnalysisTaskFragmentationFunction::GetJetTracksPointing(TList* inputlist, TList* outputlist, const AliAODJet* jet, - const Double_t radius, Double_t& sumPt, const Double_t minPtL, const Double_t maxPt, Bool_t& isBadPt) + const Double_t& radius, Double_t& sumPt, const Double_t& minPtL, const Double_t& maxPt, Bool_t& isBadPt) { // fill list of tracks in cone around jet axis @@ -3315,7 +3309,8 @@ void AliAnalysisTaskFragmentationFunction::GetJetTracksPointing(TList* inputlist } // _________________________________________________________________________________________________________________________________________________________________ -void AliAnalysisTaskFragmentationFunction::GetJetTracksTrackrefs(TList* list, const AliAODJet* jet, const Double_t minPtL, const Double_t maxPt, Bool_t& isBadPt) +void AliAnalysisTaskFragmentationFunction::GetJetTracksTrackrefs(TList* list, const AliAODJet* jet, const Double_t& minPtL, + const Double_t& maxPt, Bool_t& isBadPt) { // list of jet tracks from trackrefs @@ -3996,7 +3991,7 @@ void AliAnalysisTaskFragmentationFunction::GetClusterTracksMedian(TList* outputl // get median cluster AliAODJet* medianCluster = 0; - Double_t medianDensity = 0; + //Double_t medianDensity = 0; if(TMath::Odd(nBckgClusters)){ @@ -4006,7 +4001,7 @@ void AliAnalysisTaskFragmentationFunction::GetClusterTracksMedian(TList* outputl Double_t clusterPt = medianCluster->Pt(); Double_t area = medianCluster->EffectiveAreaCharged(); - if(area>0) medianDensity = clusterPt/area; + //if(area>0) medianDensity = clusterPt/area; } else{ @@ -4026,7 +4021,7 @@ void AliAnalysisTaskFragmentationFunction::GetClusterTracksMedian(TList* outputl Double_t area2 = medianCluster2->EffectiveAreaCharged(); if(area2>0) density2 = clusterPt2/area2; - medianDensity = 0.5*(density1+density2); + //medianDensity = 0.5*(density1+density2); medianCluster = ( (fRandom->Rndm()>0.5) ? medianCluster1 : medianCluster2 ); // select one randomly to avoid adding areas } @@ -4619,7 +4614,7 @@ void AliAnalysisTaskFragmentationFunction::FillBckgHistos(Int_t type, TList* inp } //_____________________________________________________________________________________ -Double_t AliAnalysisTaskFragmentationFunction::GetMCStrangenessFactor(const Double_t pt) +Double_t AliAnalysisTaskFragmentationFunction::GetMCStrangenessFactor(const Double_t& pt) { // factor strangeness data/MC as function of pt from UE analysis (Sara Vallero) diff --git a/PWGJE/AliAnalysisTaskFragmentationFunction.h b/PWGJE/AliAnalysisTaskFragmentationFunction.h index 9836d462164..b538e39e296 100644 --- a/PWGJE/AliAnalysisTaskFragmentationFunction.h +++ b/PWGJE/AliAnalysisTaskFragmentationFunction.h @@ -260,8 +260,9 @@ class AliAnalysisTaskFragmentationFunction : public AliAnalysisTaskSE { Float_t GetFFMaxTrackPt() const { return fFFMaxTrackPt; } Float_t GetFFMinNTracks() const { return fFFMinnTracks; } Float_t GetFFBckgRadius() const { return fFFBckgRadius; } - void GetJetTracksTrackrefs(TList* l, const AliAODJet* j, const Double_t minPtL, const Double_t maxPt, Bool_t& isBadPt); - void GetJetTracksPointing(TList* in, TList* out, const AliAODJet* j, const Double_t r, Double_t& sumPt, const Double_t minPtL, const Double_t maxPt, Bool_t& isBadPt); + void GetJetTracksTrackrefs(TList* l, const AliAODJet* j, const Double_t& minPtL, const Double_t& maxPt, Bool_t& isBadPt); + void GetJetTracksPointing(TList* in, TList* out, const AliAODJet* j, const Double_t& r, Double_t& sumPt, + const Double_t& minPtL, const Double_t& maxPt, Bool_t& isBadPt); void GetTracksOutOfNJets(Int_t nCases, TList* in, TList* out, TList* jets, Double_t& pt); void GetTracksOutOfNJetsStat(Int_t nCases, TList* in, TList* out, TList* jets, Double_t& pt, Double_t &normFactor); void GetTracksTiltedwrpJetAxis(Float_t alpha, TList* inputlist, TList* outputlist, const AliAODJet* jet, Double_t radius, Double_t& sumPt); @@ -286,7 +287,7 @@ class AliAnalysisTaskFragmentationFunction : public AliAnalysisTaskSE { void FillBckgHistos(Int_t type, TList* inputtracklist, TList* inputjetlist, AliAODJet* jet, AliFragFuncHistos* ffbckghistocuts,AliFragFuncQATrackHistos* qabckghistos,TH1F* fh1Mult = 0); - Double_t GetMCStrangenessFactor(const Double_t pt); + Double_t GetMCStrangenessFactor(const Double_t& pt); Double_t GetMCStrangenessFactorCMS(AliAODMCParticle* daughter); void FillJetShape(AliAODJet* jet, TList* list, TProfile* hProNtracksLeadingJet, TProfile** hProDelRPtSum, TProfile* hProDelR80pcPt=0, Double_t dPhiUE=0, Double_t normUE = 0, Bool_t scaleStrangeness = kFALSE); diff --git a/PWGJE/AliFragmentationFunctionCorrections.cxx b/PWGJE/AliFragmentationFunctionCorrections.cxx index 3c9892e8b78..23773068489 100644 --- a/PWGJE/AliFragmentationFunctionCorrections.cxx +++ b/PWGJE/AliFragmentationFunctionCorrections.cxx @@ -907,7 +907,7 @@ void AliFragmentationFunctionCorrections::SetHistoBins(const Int_t jetPtSlice, c } //_____________________________________________________________________________________________________________________________________ -TArrayD* AliFragmentationFunctionCorrections::GetHistoBins(const Int_t jetPtSlice, const Int_t type) +TArrayD* AliFragmentationFunctionCorrections::GetHistoBins(const Int_t& jetPtSlice, const Int_t& type) { // set histo bins for jet pt slice // if binning undefined for any slice, original binning will be used diff --git a/PWGJE/AliFragmentationFunctionCorrections.h b/PWGJE/AliFragmentationFunctionCorrections.h index abc27049339..709d7eaa1ee 100644 --- a/PWGJE/AliFragmentationFunctionCorrections.h +++ b/PWGJE/AliFragmentationFunctionCorrections.h @@ -70,7 +70,7 @@ class AliFragmentationFunctionCorrections : public TObject { void SetHistoBins(const Int_t jetPtSlice, const Int_t sizeBins, Double_t* bins,Int_t type); void SetHistoBins(const Int_t jetPtSlice, const Int_t nBinsLimits, Double_t* binsLimits, Double_t* binsWidth,Int_t type); - TArrayD* GetHistoBins(const Int_t jetPtSlice, const Int_t type); + TArrayD* GetHistoBins(const Int_t& jetPtSlice, const Int_t& type); void SetHistoBinsSinglePt(const Int_t sizeBins, Double_t* bins); void SetHistoBinsSinglePt(const Int_t nBinsLimits, Double_t* binsLimits, Double_t* binsWidth); -- 2.43.0