From c336eab0237aa576e5fb5b55bb712f13cd15a6bf Mon Sep 17 00:00:00 2001 From: cblume Date: Wed, 21 Oct 2009 13:43:48 +0000 Subject: [PATCH] Fix coding rule violations --- TRD/qaAnalysis/AliTRDqaJPsi.cxx | 50 +++++++++++++++++---------------- TRD/qaAnalysis/AliTRDqaJPsi.h | 41 ++++++++++++++------------- 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/TRD/qaAnalysis/AliTRDqaJPsi.cxx b/TRD/qaAnalysis/AliTRDqaJPsi.cxx index a445807d752..ff5d0608418 100644 --- a/TRD/qaAnalysis/AliTRDqaJPsi.cxx +++ b/TRD/qaAnalysis/AliTRDqaJPsi.cxx @@ -37,8 +37,6 @@ #include "TLorentzVector.h" -//const AliTRDqaJPsi::knSteps = 5; - //______________________________________________________________________________ AliTRDqaJPsi::AliTRDqaJPsi() @@ -53,9 +51,9 @@ AliTRDqaJPsi::AliTRDqaJPsi() // } -//______________________________________________________________________________ -AliTRDqaJPsi:: AliTRDqaJPsi(AliTRDqaJPsi& /*trd*/) +//______________________________________________________________________________ +AliTRDqaJPsi:: AliTRDqaJPsi(const AliTRDqaJPsi & /*trd*/) : AliAnalysisTask("",""), fChain(0), fESD(0), @@ -63,13 +61,11 @@ AliTRDqaJPsi:: AliTRDqaJPsi(AliTRDqaJPsi& /*trd*/) fnKFtracks(0) { // - // Dummy copy constructor + // Copy constructor // - //return *this; } - //______________________________________________________________________________ AliTRDqaJPsi::AliTRDqaJPsi(const char *name) : AliAnalysisTask(name,""), @@ -101,6 +97,9 @@ void AliTRDqaJPsi::ConnectInputData(const Option_t *) //________________________________________________________________________ void AliTRDqaJPsi::CreateOutputObjects() { + // + // Create the objects that contain the analysis output + // Int_t c = 0; fOutputContainer = new TObjArray(100); @@ -109,7 +108,7 @@ void AliTRDqaJPsi::CreateOutputObjects() // build histograms - for(Int_t i=0; iAddAt(fStatus[i], c++); @@ -132,14 +131,14 @@ void AliTRDqaJPsi::CreateOutputObjects() for(Int_t j=0; j<2; j++) { - fnTracks[j*knSteps+i] = + fnTracks[j*fgknSteps+i] = new TH1D(Form("nTracks%s_%d", charge[j],i), Form("%s;number of tracks",charge[j]), 100, -0.5, 99.5); - fPt[j*knSteps+i] = new TH1D(Form("pt%s_%d", charge[j], i), Form("%s;p_{T} (GeV/c)", charge[j]), 100, 0, 5); - fPID[j*knSteps+i] = new TH1D(Form("pid%s_%d", charge[j], i), ";electron LQ", 100, 0, 1); + fPt[j*fgknSteps+i] = new TH1D(Form("pt%s_%d", charge[j], i), Form("%s;p_{T} (GeV/c)", charge[j]), 100, 0, 5); + fPID[j*fgknSteps+i] = new TH1D(Form("pid%s_%d", charge[j], i), ";electron LQ", 100, 0, 1); - fOutputContainer->AddAt(fnTracks[j*knSteps+i], c++); - fOutputContainer->AddAt(fPt[j*knSteps+i], c++); - fOutputContainer->AddAt(fPID[j*knSteps+i], c++); + fOutputContainer->AddAt(fnTracks[j*fgknSteps+i], c++); + fOutputContainer->AddAt(fPt[j*fgknSteps+i], c++); + fOutputContainer->AddAt(fPID[j*fgknSteps+i], c++); } } @@ -173,7 +172,7 @@ void AliTRDqaJPsi::Exec(Option_t *) Int_t nTracks = fESD->GetNumberOfTracks(); - Int_t cTracks[2*knSteps] = {0,0,0,0,0,0,0,0,0,0}; + Int_t cTracks[2*fgknSteps] = {0,0,0,0,0,0,0,0,0,0}; fnKFtracks = 0; // track loop @@ -205,7 +204,7 @@ void AliTRDqaJPsi::Exec(Option_t *) // create a kalman particle Int_t pdg = (charge == 0)? -11 : 11; - for(Int_t k=0; kGetTRDntracklets() < 6) continue; - cTracks[knSteps *charge + step]++; + cTracks[fgknSteps *charge + step]++; FillHist(track, step++); if (pt < 0.8) continue; - cTracks[knSteps *charge + step]++; + cTracks[fgknSteps *charge + step]++; FillHist(track, step++); if (pid < 0.3) continue; // //if (esdPid[AliPID::kElectron] < 0.5) continue; - cTracks[knSteps *charge + step]++; + cTracks[fgknSteps *charge + step]++; FillHist(track, step); - for(Int_t k=0; k<2*knSteps; k++) fnTracks[k]->Fill(cTracks[k]); + for(Int_t k=0; k<2*fgknSteps; k++) fnTracks[k]->Fill(cTracks[k]); } // calculate invariant mass - for(Int_t k=0; kCharge() > 0) ? 1 : 0; UInt_t status = track->GetStatus(); @@ -301,7 +303,7 @@ void AliTRDqaJPsi::FillHist(AliESDtrack *track, Int_t step) { Double_t esdPid[5]; track->GetESDpid(esdPid); - Int_t id = charge * knSteps + step; + Int_t id = charge * fgknSteps + step; AliTRDqaAT::FillStatus(fStatus[step], status); fPt[id]->Fill(pt); fPID[id]->Fill(pid); diff --git a/TRD/qaAnalysis/AliTRDqaJPsi.h b/TRD/qaAnalysis/AliTRDqaJPsi.h index 18367bc9e26..e965541bd33 100644 --- a/TRD/qaAnalysis/AliTRDqaJPsi.h +++ b/TRD/qaAnalysis/AliTRDqaJPsi.h @@ -14,13 +14,14 @@ #include "AliAnalysisTask.h" class TTree; -class AliESDEvent; -class AliESDtrack; class TH1D; class TH2D; +class TLorentzVector; + class AliExternalTrackParam; class AliKFParticle; -class TLorentzVector; +class AliESDEvent; +class AliESDtrack; class AliTRDqaJPsi : public AliAnalysisTask { @@ -28,8 +29,8 @@ class AliTRDqaJPsi : public AliAnalysisTask { AliTRDqaJPsi(); AliTRDqaJPsi(const char *name); - AliTRDqaJPsi(AliTRDqaJPsi& trd); - AliTRDqaJPsi& operator = (const AliTRDqaJPsi& /*g*/) { return *this; }; + AliTRDqaJPsi(const AliTRDqaJPsi &trd); + AliTRDqaJPsi &operator=(const AliTRDqaJPsi & /*g*/) { return *this; }; virtual ~AliTRDqaJPsi() {} virtual void Exec(Option_t * opt = ""); @@ -46,27 +47,27 @@ class AliTRDqaJPsi : public AliAnalysisTask { // histograms - static const Int_t knSteps = 5; // number of analysis steps (arbitrary) + static const Int_t fgknSteps = 5; // number of analysis steps (arbitrary) - TH1D *fStatus[knSteps]; // track status - TH1D *fnTracks[2*knSteps]; // number of tracks - TH1D *fPt[2*knSteps]; // transverse momentum - TH1D *fPID[2*knSteps]; // PID LQ - TH1D *fAngleSM[knSteps]; // difference in SM ID + TH1D *fStatus[fgknSteps]; // track status + TH1D *fnTracks[2*fgknSteps]; // number of tracks + TH1D *fPt[2*fgknSteps]; // transverse momentum + TH1D *fPID[2*fgknSteps]; // PID LQ + TH1D *fAngleSM[fgknSteps]; // difference in SM ID //TH2D *fnGoodTracks; // correlation of the final number of Pos and Neg tracks - TH1D *fInvMass[knSteps]; // invariant mass using different cuts - TH1D *fInvMassVec[knSteps]; // - TH1D *fInvMassDiff[knSteps]; // + TH1D *fInvMass[fgknSteps]; // invariant mass using different cuts + TH1D *fInvMassVec[fgknSteps]; // invariant mass + TH1D *fInvMassDiff[fgknSteps]; // invariant mass difference - TH2D *fPtAngle[knSteps]; + TH2D *fPtAngle[fgknSteps]; // pt angle // tracks - AliKFParticle *fTracks[1000]; - TLorentzVector *fVec[1000]; - Int_t fInSample[1000][knSteps]; - Int_t fSM[1000]; - Int_t fnKFtracks; //[2]; + AliKFParticle *fTracks[1000]; // tracks + TLorentzVector *fVec[1000]; // Lorentz vector for the tracks + Int_t fInSample[1000][fgknSteps]; // in sample? + Int_t fSM[1000]; // TRD sector + Int_t fnKFtracks; //[2]; // helper functions void FillHist(AliESDtrack *track, Int_t step); -- 2.39.3