Coding rule violations corrected.

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index 07ababc..a488c76 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -854,7 +854,7 @@ void AliGenPythia::FinishRun()
     printf("\nMean Q, x1, x2: %f %f %f\n", fQ, fX1, fX2);
 }
 
-void AliGenPythia::AdjustWeights()
+void AliGenPythia::AdjustWeights() const
 {
 // Adjust the weights after generation of all events
 //
@@ -880,6 +880,9 @@ void AliGenPythia::SetNuclei(Int_t a1, Int_t a2)
 
 void AliGenPythia::MakeHeader()
 {
+//
+// Make header for the simulated event
+// 
   if (gAlice) {
     if (gAlice->GetEvNumber()>=fDebugEventFirst &&
        gAlice->GetEvNumber()<=fDebugEventLast) fPythia->Pylist(2);
@@ -1020,9 +1023,11 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2)
 }
 
 
-//Checking Kinematics on Child (status code 1, particle code ?, kin cuts
-Bool_t AliGenPythia::CheckKinematicsOnChild(){
 
+Bool_t AliGenPythia::CheckKinematicsOnChild(){
+//
+//Checking Kinematics on Child (status code 1, particle code ?, kin cuts
+//
     Bool_t checking = kFALSE;
     Int_t j, kcode, ks, km;
     Int_t nPartAcc = 0; //number of particles in the acceptance range
@@ -1074,12 +1079,12 @@ void  AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr)
     
     
     for (Int_t part = 0; part < npart; part++) {
-       TParticle *MPart = stack->Particle(part);
+       TParticle *mPart = stack->Particle(part);
        
-       Int_t kf     =  MPart->GetPdgCode();
-       Int_t ks     =  MPart->GetStatusCode();
-       Int_t idf    =  MPart->GetFirstDaughter();
-       Int_t idl    =  MPart->GetLastDaughter();
+       Int_t kf     =  mPart->GetPdgCode();
+       Int_t ks     =  mPart->GetStatusCode();
+       Int_t idf    =  mPart->GetFirstDaughter();
+       Int_t idl    =  mPart->GetLastDaughter();
        
        if (reHadr) {
            if (ks == 11 || ks == 12) {
@@ -1089,11 +1094,11 @@ void  AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr)
            }
        }
        
-       Float_t px = MPart->Px();
-       Float_t py = MPart->Py();
-       Float_t pz = MPart->Pz();
-       Float_t e  = MPart->Energy();
-       Float_t m  = MPart->GetCalcMass();
+       Float_t px = mPart->Px();
+       Float_t py = mPart->Py();
+       Float_t pz = mPart->Pz();
+       Float_t e  = mPart->Energy();
+       Float_t m  = mPart->GetCalcMass();
        
        
        (fPythia->GetPyjets())->P[0][part+n0] = px;
@@ -1106,7 +1111,7 @@ void  AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr)
        (fPythia->GetPyjets())->K[0][part+n0] = ks;
        (fPythia->GetPyjets())->K[3][part+n0] = idf + 1;
        (fPythia->GetPyjets())->K[4][part+n0] = idl + 1;
-       (fPythia->GetPyjets())->K[2][part+n0] = MPart->GetFirstMother() + 1;
+       (fPythia->GetPyjets())->K[2][part+n0] = mPart->GetFirstMother() + 1;
     }
 }
 

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index a8d3f24..9c66dde 100644 (file)
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -107,7 +107,7 @@ class AliGenPythia : public AliGenMC
     // get cross section of process
     virtual Float_t GetXsection() const {return fXsection;}
     // get triggered jets
-    void GetJets(Int_t& njets, Int_t& ntrig, Float_t[4][10]);
+    void GetJets(Int_t& njets, Int_t& ntrig, Float_t jets[4][10]);
     void RecJetsUA1(Int_t& njets, Float_t jets[4][50]);
     void SetPycellParameters(Float_t etamax = 2., Int_t neta = 274, Int_t nphi = 432,
                             Float_t thresh = 0., Float_t etseed = 4.,
@@ -115,20 +115,20 @@ class AliGenPythia : public AliGenMC
     
     void LoadEvent(AliStack* stack, Int_t flag = 0, Int_t reHadr = 0);
     // Getters
-    virtual Process_t    GetProcess() {return fProcess;}
-    virtual StrucFunc_t  GetStrucFunc() {return fStrucFunc;}
-    virtual void         GetPtHard(Float_t& ptmin, Float_t& ptmax)
+    virtual Process_t    GetProcess() const {return fProcess;}
+    virtual StrucFunc_t  GetStrucFunc() const {return fStrucFunc;}
+    virtual void         GetPtHard(Float_t& ptmin, Float_t& ptmax) const
        {ptmin = fPtHardMin; ptmax = fPtHardMax;}
-    virtual Float_t      GetEnergyCMS() {return fEnergyCMS;}
-    virtual void         GetNuclei(Int_t&  a1, Int_t& a2)
+    virtual Float_t      GetEnergyCMS() const {return fEnergyCMS;}
+    virtual void         GetNuclei(Int_t&  a1, Int_t& a2) const
        {a1 = fAProjectile; a2 = fATarget;}
-    virtual void         GetJetEtRange(Float_t& etamin, Float_t& etamax)
+    virtual void         GetJetEtRange(Float_t& etamin, Float_t& etamax) const
        {etamin = fEtaMinJet; etamax = fEtaMaxJet;}
-    virtual void         GetJetPhiRange(Float_t& phimin, Float_t& phimax)
+    virtual void         GetJetPhiRange(Float_t& phimin, Float_t& phimax) const
        {phimin = fPhiMinJet*180./TMath::Pi(); phimax = fPhiMaxJet*180/TMath::Pi();}
-    virtual void         GetGammaEtaRange(Float_t& etamin, Float_t& etamax)
+    virtual void         GetGammaEtaRange(Float_t& etamin, Float_t& etamax) const
        {etamin = fEtaMinGamma; etamax = fEtaMaxGamma;}
-    virtual void         GetGammaPhiRange(Float_t& phimin, Float_t& phimax)
+    virtual void         GetGammaPhiRange(Float_t& phimin, Float_t& phimax) const
        {phimin = fPhiMinGamma*180./TMath::Pi(); phimax = fPhiMaxGamma*180./TMath::Pi();}
     //
     virtual void FinishRun();
@@ -145,7 +145,7 @@ class AliGenPythia : public AliGenMC
     
  protected:
     // adjust the weight from kinematic cuts
-    void     AdjustWeights();
+    void     AdjustWeights() const;
     Int_t    GenerateMB();
     void     MakeHeader();    
     void     GeneratePileup();