From: odjuvsla Date: Wed, 15 Sep 2010 18:18:44 +0000 (+0000) Subject: - fixing coding violations X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=8985c506869464a3f82fbdd1410920f2b1099ad1;p=u%2Fmrichter%2FAliRoot.git - fixing coding violations --- diff --git a/PWG4/totEt/AliAnalysisEt.cxx b/PWG4/totEt/AliAnalysisEt.cxx index 61503f3da95..4c5927125e1 100644 --- a/PWG4/totEt/AliAnalysisEt.cxx +++ b/PWG4/totEt/AliAnalysisEt.cxx @@ -14,29 +14,29 @@ ClassImp(AliAnalysisEt); AliAnalysisEt::AliAnalysisEt() : fHistogramNameSuffix("") ,fPdgDB(0) - ,PiPlusCode(0) - ,PiMinusCode(0) - ,KPlusCode(0) - ,KMinusCode(0) - ,ProtonCode(0) - ,AntiProtonCode(0) - ,LambdaCode(0) - ,AntiLambdaCode(0) - ,K0SCode(0) - ,OmegaCode(0) - ,AntiOmegaCode(0) - ,Xi0Code(0) - ,AntiXi0Code(0) - ,XiCode(0) - ,AntiXiCode(0) - ,SigmaCode(0) - ,AntiSigmaCode(0) - ,K0LCode(0) - ,NeutronCode(0) - ,AntiNeutronCode(0) - ,EPlusCode(0) - ,EMinusCode(0) - ,PionMass(0) + ,fPiPlusCode(0) + ,fPiMinusCode(0) + ,fKPlusCode(0) + ,fKMinusCode(0) + ,fProtonCode(0) + ,fAntiProtonCode(0) + ,fLambdaCode(0) + ,fAntiLambdaCode(0) + ,fK0SCode(0) + ,fOmegaCode(0) + ,fAntiOmegaCode(0) + ,fXi0Code(0) + ,fAntiXi0Code(0) + ,fXiCode(0) + ,fAntiXiCode(0) + ,fSigmaCode(0) + ,fAntiSigmaCode(0) + ,fK0LCode(0) + ,fNeutronCode(0) + ,fAntiNeutronCode(0) + ,fEPlusCode(0) + ,fEMinusCode(0) + ,fPionMass(0) ,fSumEt(0) ,fSumEtAcc(0) ,fTotEt(0) @@ -266,39 +266,39 @@ void AliAnalysisEt::ResetEventValues() if(!fPdgDB) fPdgDB = new TDatabasePDG(); - if(PiPlusCode==0){ + if(fPiPlusCode==0){ SetParticleCodes(); } } void AliAnalysisEt::SetParticleCodes() { - PionMass = fPdgDB->GetParticle("pi+")->Mass(); - PiPlusCode = fPdgDB->GetParticle("pi+")->PdgCode(); - PiMinusCode = fPdgDB->GetParticle("pi-")->PdgCode(); - KPlusCode = fPdgDB->GetParticle("K+")->PdgCode(); - KMinusCode = fPdgDB->GetParticle("K-")->PdgCode(); - ProtonCode = fPdgDB->GetParticle("proton")->PdgCode(); - AntiProtonCode = fPdgDB->GetParticle("antiproton")->PdgCode(); - LambdaCode = fPdgDB->GetParticle("Lambda0")->PdgCode(); - AntiLambdaCode = fPdgDB->GetParticle("Lambda0_bar")->PdgCode(); - K0SCode = fPdgDB->GetParticle("K_S0")->PdgCode(); - OmegaCode = fPdgDB->GetParticle("Omega-")->PdgCode(); - AntiOmegaCode = fPdgDB->GetParticle("Omega+")->PdgCode(); - Xi0Code = fPdgDB->GetParticle("Xi0")->PdgCode(); - AntiXi0Code = fPdgDB->GetParticle("Xi0_bar")->PdgCode(); - XiCode = fPdgDB->GetParticle("Xi-")->PdgCode(); - AntiXiCode = fPdgDB->GetParticle("Xi-_bar")->PdgCode(); - SigmaCode = fPdgDB->GetParticle("Sigma-")->PdgCode(); - AntiSigmaCode = fPdgDB->GetParticle("Sigma+")->PdgCode(); - K0LCode = fPdgDB->GetParticle("K_L0")->PdgCode(); - NeutronCode = fPdgDB->GetParticle("neutron")->PdgCode(); - AntiNeutronCode = fPdgDB->GetParticle("antineutron")->PdgCode(); - EPlusCode = fPdgDB->GetParticle("e+")->PdgCode(); - EMinusCode = fPdgDB->GetParticle("e-")->PdgCode(); - cout << "Resetting Codes: Pion " << PiPlusCode - << "," << PiMinusCode - << " Kaon " << KPlusCode - << "," << KMinusCode << endl; + fPionMass = fPdgDB->GetParticle("pi+")->Mass(); + fPiPlusCode = fPdgDB->GetParticle("pi+")->PdgCode(); + fPiMinusCode = fPdgDB->GetParticle("pi-")->PdgCode(); + fKPlusCode = fPdgDB->GetParticle("K+")->PdgCode(); + fKMinusCode = fPdgDB->GetParticle("K-")->PdgCode(); + fProtonCode = fPdgDB->GetParticle("proton")->PdgCode(); + fAntiProtonCode = fPdgDB->GetParticle("antiproton")->PdgCode(); + fLambdaCode = fPdgDB->GetParticle("Lambda0")->PdgCode(); + fAntiLambdaCode = fPdgDB->GetParticle("Lambda0_bar")->PdgCode(); + fK0SCode = fPdgDB->GetParticle("K_S0")->PdgCode(); + fOmegaCode = fPdgDB->GetParticle("Omega-")->PdgCode(); + fAntiOmegaCode = fPdgDB->GetParticle("Omega+")->PdgCode(); + fXi0Code = fPdgDB->GetParticle("Xi0")->PdgCode(); + fAntiXi0Code = fPdgDB->GetParticle("Xi0_bar")->PdgCode(); + fXiCode = fPdgDB->GetParticle("Xi-")->PdgCode(); + fAntiXiCode = fPdgDB->GetParticle("Xi-_bar")->PdgCode(); + fSigmaCode = fPdgDB->GetParticle("Sigma-")->PdgCode(); + fAntiSigmaCode = fPdgDB->GetParticle("Sigma+")->PdgCode(); + fK0LCode = fPdgDB->GetParticle("K_L0")->PdgCode(); + fNeutronCode = fPdgDB->GetParticle("neutron")->PdgCode(); + fAntiNeutronCode = fPdgDB->GetParticle("antineutron")->PdgCode(); + fEPlusCode = fPdgDB->GetParticle("e+")->PdgCode(); + fEMinusCode = fPdgDB->GetParticle("e-")->PdgCode(); + cout << "Resetting Codes: Pion " << fPiPlusCode + << "," << fPiMinusCode + << " Kaon " << fKPlusCode + << "," << fKMinusCode << endl; } diff --git a/PWG4/totEt/AliAnalysisEt.h b/PWG4/totEt/AliAnalysisEt.h index b2b5f0d4459..11fd60d1595 100644 --- a/PWG4/totEt/AliAnalysisEt.h +++ b/PWG4/totEt/AliAnalysisEt.h @@ -81,29 +81,29 @@ protected: /** PDG Database */ TDatabasePDG *fPdgDB; - Int_t PiPlusCode; - Int_t PiMinusCode; - Int_t KPlusCode; - Int_t KMinusCode; - Int_t ProtonCode; - Int_t AntiProtonCode; - Int_t LambdaCode; - Int_t AntiLambdaCode; - Int_t K0SCode; - Int_t OmegaCode; - Int_t AntiOmegaCode; - Int_t Xi0Code; - Int_t AntiXi0Code; - Int_t XiCode; - Int_t AntiXiCode; - Int_t SigmaCode; - Int_t AntiSigmaCode; - Int_t K0LCode; - Int_t NeutronCode; - Int_t AntiNeutronCode; - Int_t EPlusCode; - Int_t EMinusCode; - Float_t PionMass; + Int_t fPiPlusCode; + Int_t fPiMinusCode; + Int_t fKPlusCode; + Int_t fKMinusCode; + Int_t fProtonCode; + Int_t fAntiProtonCode; + Int_t fLambdaCode; + Int_t fAntiLambdaCode; + Int_t fK0SCode; + Int_t fOmegaCode; + Int_t fAntiOmegaCode; + Int_t fXi0Code; + Int_t fAntiXi0Code; + Int_t fXiCode; + Int_t fAntiXiCode; + Int_t fSigmaCode; + Int_t fAntiSigmaCode; + Int_t fK0LCode; + Int_t fNeutronCode; + Int_t fAntiNeutronCode; + Int_t fEPlusCode; + Int_t fEMinusCode; + Float_t fPionMass; /** Sum of the total Et for all events */ Double_t fSumEt; diff --git a/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx b/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx index 6fa95816385..c03ebef8842 100644 --- a/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx +++ b/PWG4/totEt/AliAnalysisEtMonteCarlo.cxx @@ -46,12 +46,12 @@ Int_t AliAnalysisEtMonteCarlo::AnalyseEvent(AliVEvent* ev) TParticlePDG *pdgCode = part->GetPDG(0); if ( - TMath::Abs(pdgCode->PdgCode()) == ProtonCode || - TMath::Abs(pdgCode->PdgCode()) == NeutronCode || - TMath::Abs(pdgCode->PdgCode()) == LambdaCode || - TMath::Abs(pdgCode->PdgCode()) == XiCode || - TMath::Abs(pdgCode->PdgCode()) == Xi0Code || - TMath::Abs(pdgCode->PdgCode()) == OmegaCode + TMath::Abs(pdgCode->PdgCode()) == fProtonCode || + TMath::Abs(pdgCode->PdgCode()) == fNeutronCode || + TMath::Abs(pdgCode->PdgCode()) == fLambdaCode || + TMath::Abs(pdgCode->PdgCode()) == fXiCode || + TMath::Abs(pdgCode->PdgCode()) == fXi0Code || + TMath::Abs(pdgCode->PdgCode()) == fOmegaCode ) { particleMassPart = -TMath::Sign(pdgCode->PdgCode(), pdgCode->PdgCode())*pdgCode->Mass();