From 76273318d7b5c0c000d51027a4d4e8b73f4b9b73 Mon Sep 17 00:00:00 2001 From: marian Date: Tue, 26 Jan 2010 12:37:59 +0000 Subject: [PATCH] Coding violation fixing (Marian) --- TPC/AliTPCcalibCosmic.cxx | 24 ++++++++++++------------ TPC/AliTPCcalibCosmic.h | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/TPC/AliTPCcalibCosmic.cxx b/TPC/AliTPCcalibCosmic.cxx index 790d30876ca..aabc636cee4 100644 --- a/TPC/AliTPCcalibCosmic.cxx +++ b/TPC/AliTPCcalibCosmic.cxx @@ -332,9 +332,9 @@ void AliTPCcalibCosmic::Process(AliESDEvent *event) { Printf("ERROR: ESD not available"); return; } - 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; } @@ -528,7 +528,7 @@ void AliTPCcalibCosmic::FindPairs(AliESDEvent *event) { // Track1 is choosen in lower TPC part // if (GetDebugLevel()>20) printf("Hallo world: Im here\n"); - AliESDfriend *ESDfriend=static_cast(event->FindListObject("AliESDfriend")); + AliESDfriend *esdFriend=static_cast(event->FindListObject("AliESDfriend")); Int_t ntracks=event->GetNumberOfTracks(); TObjArray tpcSeeds(ntracks); if (ntracks==0) return; @@ -549,7 +549,7 @@ void AliTPCcalibCosmic::FindPairs(AliESDEvent *event) { if (ntracks>4 && TMath::Abs(trackIn->GetTgl())<0.0015) continue; // filter laser - AliESDfriendTrack *friendTrack = ESDfriend->GetTrack(i); + AliESDfriendTrack *friendTrack = esdFriend->GetTrack(i); TObject *calibObject; AliTPCseed *seed = 0; for (Int_t l=0;(calibObject=friendTrack->GetCalibObject(l));++l) { @@ -761,7 +761,7 @@ void AliTPCcalibCosmic::FillAcordeHist(AliESDtrack *upperTrack) { // Pt cut to select straight tracks which can be easily propagated to ACORDE which is outside the magnetic field if (upperTrack->Pt() < 10 || upperTrack->GetTPCNcls() < 80) return; - const Double_t AcordePlane = 850.; // distance of the central Acorde detectors to the beam line at y =0 + const Double_t acordePlane = 850.; // distance of the central Acorde detectors to the beam line at y =0 const Double_t roof = 210.5; // distance from x =0 to end of magnet roof Double_t r[3]; @@ -769,16 +769,16 @@ void AliTPCcalibCosmic::FillAcordeHist(AliESDtrack *upperTrack) { Double_t d[3]; upperTrack->GetDirection(d); Double_t x,z; - z = r[2] + (d[2]/d[1])*(AcordePlane - r[1]); - x = r[0] + (d[0]/d[1])*(AcordePlane - r[1]); + z = r[2] + (d[2]/d[1])*(acordePlane - r[1]); + x = r[0] + (d[0]/d[1])*(acordePlane - r[1]); if (x > roof) { - x = r[0] + (d[0]/(d[0]+d[1]))*(AcordePlane+roof-r[0]-r[1]); - z = r[2] + (d[2]/(d[0]+d[1]))*(AcordePlane+roof-r[0]-r[1]); + x = r[0] + (d[0]/(d[0]+d[1]))*(acordePlane+roof-r[0]-r[1]); + z = r[2] + (d[2]/(d[0]+d[1]))*(acordePlane+roof-r[0]-r[1]); } if (x < -roof) { - x = r[0] + (d[0]/(d[1]-d[0]))*(AcordePlane+roof+r[0]-r[1]); - z = r[2] + (d[2]/(d[1]-d[0]))*(AcordePlane+roof+r[0]-r[1]); + x = r[0] + (d[0]/(d[1]-d[0]))*(acordePlane+roof+r[0]-r[1]); + z = r[2] + (d[2]/(d[1]-d[0]))*(acordePlane+roof+r[0]-r[1]); } fModules->Fill(z, x); diff --git a/TPC/AliTPCcalibCosmic.h b/TPC/AliTPCcalibCosmic.h index 11c7c806f29..64bb3b96e52 100644 --- a/TPC/AliTPCcalibCosmic.h +++ b/TPC/AliTPCcalibCosmic.h @@ -43,20 +43,20 @@ public: // - TH1F * GetHistNTracks(){return fHistNTracks;}; - TH1F * GetHistClusters(){return fClusters;}; - TH2F * GetHistAcorde(){return fModules;}; - TH1F * GetHistPt(){return fHistPt;}; - TH2F * GetHistDeDx(){return fDeDx;}; - TH1F * GetHistMIP(){return fDeDxMIP;}; + TH1F * GetHistNTracks() const {return fHistNTracks;}; + TH1F * GetHistClusters() const {return fClusters;}; + TH2F * GetHistAcorde()const {return fModules;}; + TH1F * GetHistPt() const {return fHistPt;}; + TH2F * GetHistDeDx() const {return fDeDx;}; + TH1F * GetHistMIP() const {return fDeDxMIP;}; // - Double_t GetMIPvalue(){return fMIPvalue;}; + Double_t GetMIPvalue()const {return fMIPvalue;}; // static void BinLogX(TH1 * h); // method for correct histogram binning static void BinLogX(THnSparse * h, Int_t axisDim); // method for correct histogram binning - void Process(AliESDtrack *track, Int_t runNo=-1){AliTPCcalibBase::Process(track,runNo);}; - void Process(AliTPCseed *track){return AliTPCcalibBase::Process(track);} + void Process(AliESDtrack *track, Int_t runNo=-1) {AliTPCcalibBase::Process(track,runNo);}; + void Process(AliTPCseed *track) {return AliTPCcalibBase::Process(track);} // // Performance histograms -- 2.43.0