From 14fae91a11518a8c77fb20449268256f9fee2b53 Mon Sep 17 00:00:00 2001 From: marian Date: Sat, 27 Feb 2010 14:21:54 +0000 Subject: [PATCH] Coding violation removal --- TPC/AliTPCcalibPID.cxx | 26 +++++++++++++------------- TPC/AliTPCcalibPID.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/TPC/AliTPCcalibPID.cxx b/TPC/AliTPCcalibPID.cxx index 73b9d47f06e..47eaed9789f 100644 --- a/TPC/AliTPCcalibPID.cxx +++ b/TPC/AliTPCcalibPID.cxx @@ -251,9 +251,9 @@ void AliTPCcalibPID::Process(AliESDEvent *event) { Int_t ntracks=event->GetNumberOfTracks(); fHistNTracks->Fill(ntracks); - AliESDfriend *ESDfriend=static_cast(event->FindListObject("AliESDfriend")); - if (!ESDfriend) { - Printf("ERROR: ESDfriend not available"); + AliESDfriend *esdFriend=static_cast(event->FindListObject("AliESDfriend")); + if (!esdFriend) { + Printf("ERROR: esdFriend not available"); return; } // @@ -274,10 +274,10 @@ void AliTPCcalibPID::Process(AliESDEvent *event) { //Double_t meanP = 0.5*(trackIn->GetP() + trackOut->GetP()); Double_t meanP = trackIn->GetP(); //Double_t d = trackIn->GetLinearD(0,0); - Int_t NclsDeDx = track->GetTPCNcls(); + Int_t nclsDeDx = track->GetTPCNcls(); //if (meanP > 0.7 || meanP < 0.2) continue; - if (NclsDeDx < 60) continue; + if (nclsDeDx < 60) continue; // exclude tracks which do not look like primaries or are simply too short or on wrong sectors @@ -291,7 +291,7 @@ void AliTPCcalibPID::Process(AliESDEvent *event) { if (TMath::Abs(trackIn->GetAlpha()+0.872665)<0.01 || TMath::Abs(trackOut->GetAlpha()+0.872665)<0.01) continue; // Funny sector ! // Get seeds - AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i); + AliESDfriendTrack *friendTrack = esdFriend->GetTrack(i); if (!friendTrack) continue; TObject *calibObject; AliTPCseed *seed = 0; @@ -379,8 +379,8 @@ void AliTPCcalibPID::Process(AliESDEvent *event) { if (ncl[itype]0) ? dEdxTotFull[itype]/dEdxTot[itype]:0; Double_t ratioTrackletTruncMax = (dEdxMax[0]>0) ? dEdxMaxFull[itype]/dEdxMax[itype]:0; - Double_t vecRatioMaxTot[8] = {ratioMaxTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,NclsDeDx,itype}; - Double_t vecRatioTrackletTot[8] = {ratioTrackletTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,NclsDeDx,itype}; - Double_t vecRatioTrackletMax[8] = {ratioTrackletMax, drift,snp,tgl,dEdxMax[0], dEdxMax[0]*deltaL,NclsDeDx,itype}; - Double_t vecRatioTrackletTruncTot[8] = {ratioTrackletTruncTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,NclsDeDx,itype}; - Double_t vecRatioTrackletTruncMax[8] = {ratioTrackletTruncMax, drift,snp,tgl,dEdxMax[0], dEdxMax[0]*deltaL,NclsDeDx,itype}; + Double_t vecRatioMaxTot[8] = {ratioMaxTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,nclsDeDx,itype}; + Double_t vecRatioTrackletTot[8] = {ratioTrackletTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,nclsDeDx,itype}; + Double_t vecRatioTrackletMax[8] = {ratioTrackletMax, drift,snp,tgl,dEdxMax[0], dEdxMax[0]*deltaL,nclsDeDx,itype}; + Double_t vecRatioTrackletTruncTot[8] = {ratioTrackletTruncTot, drift,snp,tgl,dEdxTot[0], dEdxTot[0]*deltaL,nclsDeDx,itype}; + Double_t vecRatioTrackletTruncMax[8] = {ratioTrackletTruncMax, drift,snp,tgl,dEdxMax[0], dEdxMax[0]*deltaL,nclsDeDx,itype}; fDeDxQmax->Fill(vecQmax); fDeDxQtot->Fill(vecQtot); fDeDxRatioMaxTot->Fill(vecRatioMaxTot); diff --git a/TPC/AliTPCcalibPID.h b/TPC/AliTPCcalibPID.h index 8dabbea86a6..55cb62a430c 100644 --- a/TPC/AliTPCcalibPID.h +++ b/TPC/AliTPCcalibPID.h @@ -1,5 +1,5 @@ -#ifndef ALITPCCALIBCPID_H -#define ALITPCCALIBCPID_H +#ifndef ALITPCCALIBPID_H +#define ALITPCCALIBPID_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -34,18 +34,18 @@ public: void DrawResolBGQtot(Int_t minClusters, Int_t maxClusters, Float_t minp, Float_t maxp, const char *outputpath, Bool_t resol=kTRUE); // void DrawResolBGQmax(Int_t minClusters, Int_t maxClusters, Float_t minp, Float_t maxp, const char *outputpath, Bool_t resol=kTRUE); // - TH1F * GetHistNTracks(){return fHistNTracks;}; - TH1F * GetHistClusters(){return fClusters;}; - TH2F * GetHistPileUp(){return fPileUp;}; - TH2F * GetHistLandau(){return fLandau;}; + TH1F * GetHistNTracks() const {return fHistNTracks;}; + TH1F * GetHistClusters() const {return fClusters;}; + TH2F * GetHistPileUp() const {return fPileUp;}; + TH2F * GetHistLandau() const {return fLandau;}; // - THnSparseS * GetHistQmax(){return fDeDxQmax;}; - THnSparseS * GetHistQtot(){return fDeDxQtot;}; - THnSparseS * GetHistRatioMaxTot(){return fDeDxRatioMaxTot;}; - THnSparseS * GetHistRatioQmax(){return fDeDxRatioQmax;}; - THnSparseS * GetHistRatioQtot(){return fDeDxRatioQtot;}; - THnSparseS * GetHistRatioTruncQmax(){return fDeDxRatioTruncQmax;}; - THnSparseS * GetHistRatioTruncQtot(){return fDeDxRatioTruncQtot;}; + THnSparseS * GetHistQmax() const {return fDeDxQmax;}; + THnSparseS * GetHistQtot() const {return fDeDxQtot;}; + THnSparseS * GetHistRatioMaxTot() const {return fDeDxRatioMaxTot;}; + THnSparseS * GetHistRatioQmax() const {return fDeDxRatioQmax;}; + THnSparseS * GetHistRatioQtot() const {return fDeDxRatioQtot;}; + THnSparseS * GetHistRatioTruncQmax() const {return fDeDxRatioTruncQmax;}; + THnSparseS * GetHistRatioTruncQtot() const {return fDeDxRatioTruncQtot;}; // void SetMIPvalue(Float_t mip){fMIP = mip;}; void SetLowerTrunc(Float_t lowerTrunc){fLowerTrunc = lowerTrunc;}; @@ -65,14 +65,14 @@ private: // // parameter specifications // - Float_t fMIP; - Float_t fLowerTrunc; - Float_t fUpperTrunc; - Bool_t fUseShapeNorm; - Int_t fUsePosNorm; - Int_t fUsePadNorm; + Float_t fMIP; // MIP position to be in fMIP + Float_t fLowerTrunc; // lower truncation for dEdx + Float_t fUpperTrunc; // upper truncation for dEdx + Bool_t fUseShapeNorm; // switch - use shape normalization + Int_t fUsePosNorm; // switch use position normalization + Int_t fUsePadNorm; // switch use pad normalization // - Bool_t fIsCosmic; + Bool_t fIsCosmic; // swith is cosmic - to be removed once event specie in ESD introduced // // histograms // -- 2.43.0