Shadowing of variables corrected.

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index ab4c8a7935129aedffea2d7743da0e313a28ac28..97159fcb492029f9ffa3af0bb9a20c8b05b9e7dc 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -646,8 +646,8 @@ void AliGenPythia::Generate()
                        if (pdgD == 91 || pdgD == 92) {
                            Int_t jmin = daughter->GetFirstDaughter() - 1;
                            Int_t jmax = daughter->GetLastDaughter()  - 1;                          
-                           for (Int_t j = jmin; j <= jmax; j++)
-                               ((TParticle *) fParticles.At(j))->SetFirstMother(i+1);
+                           for (Int_t jp = jmin; jp <= jmax; jp++)
+                               ((TParticle *) fParticles.At(jp))->SetFirstMother(i+1);
                        } // is string or cluster
                    } // has daughter
                } // heavy quark

diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx
index d0dd9d739f90d9416e4f485536ec9b8c4bd71bb3..90e275e0579bbd68a51bb7e629242f4d72f84ee9 100644 (file)
--- a/PYTHIA6/AliGenPythiaPlus.cxx
+++ b/PYTHIA6/AliGenPythiaPlus.cxx
@@ -623,8 +623,8 @@ void AliGenPythiaPlus::Generate()
                            Int_t jmin = (fPythia->Version() == 6) ? (daughter->GetFirstDaughter() - 1) : (daughter->GetFirstDaughter());
                            Int_t jmax = (fPythia->Version() == 6) ? (daughter->GetLastDaughter() - 1)  : (daughter->GetLastDaughter());
 
-                           for (Int_t j = jmin; j <= jmax; j++)
-                               ((TParticle *) fParticles.At(j))->SetFirstMother(i+1);
+                           for (Int_t jp = jmin; jp <= jmax; jp++)
+                               ((TParticle *) fParticles.At(jp))->SetFirstMother(i+1);
                        } // is string or cluster
                    } // has daughter
                } // heavy quark

diff --git a/PYTHIA6/AliPythia.cxx b/PYTHIA6/AliPythia.cxx
index b31c9481445643248a9081dee20a176022a13a2a..fd73290e0ef06a42692c9a17236ca3561bd784df 100644 (file)
--- a/PYTHIA6/AliPythia.cxx
+++ b/PYTHIA6/AliPythia.cxx
@@ -1106,16 +1106,16 @@ void  AliPythia::Quench()
                // Isotropic decay ????
                Double_t cost = 2. * gRandom->Rndm() - 1.;
                Double_t sint = TMath::Sqrt(1. - cost * cost);
-               Double_t phi =  2. * TMath::Pi() * gRandom->Rndm();
+               Double_t phis =  2. * TMath::Pi() * gRandom->Rndm();
                
                Double_t pz1 =   pst * cost;
                Double_t pz2 =  -pst * cost;
                Double_t pt1 =   pst * sint;
                Double_t pt2 =  -pst * sint;
-               Double_t px1 =   pt1 * TMath::Cos(phi);
-               Double_t py1 =   pt1 * TMath::Sin(phi);     
-               Double_t px2 =   pt2 * TMath::Cos(phi);
-               Double_t py2 =   pt2 * TMath::Sin(phi);     
+               Double_t px1 =   pt1 * TMath::Cos(phis);
+               Double_t py1 =   pt1 * TMath::Sin(phis);            
+               Double_t px2 =   pt2 * TMath::Cos(phis);
+               Double_t py2 =   pt2 * TMath::Sin(phis);            
                
                fPyjets->P[0][iGlu] = px1;
                fPyjets->P[1][iGlu] = py1;

diff --git a/PYTHIA6/AliPythia6.cxx b/PYTHIA6/AliPythia6.cxx
index da77784e1319b2a8ff426be6ade32bfd9ea04da9..4a4eedbcbbd53365063fbff1d41eaee472c8776b 100644 (file)
--- a/PYTHIA6/AliPythia6.cxx
+++ b/PYTHIA6/AliPythia6.cxx
@@ -1116,16 +1116,16 @@ void  AliPythia6::Quench()
                // Isotropic decay ????
                Double_t cost = 2. * gRandom->Rndm() - 1.;
                Double_t sint = TMath::Sqrt(1. - cost * cost);
-               Double_t phi =  2. * TMath::Pi() * gRandom->Rndm();
+               Double_t phis =  2. * TMath::Pi() * gRandom->Rndm();
                
                Double_t pz1 =   pst * cost;
                Double_t pz2 =  -pst * cost;
                Double_t pt1 =   pst * sint;
                Double_t pt2 =  -pst * sint;
-               Double_t px1 =   pt1 * TMath::Cos(phi);
-               Double_t py1 =   pt1 * TMath::Sin(phi);     
-               Double_t px2 =   pt2 * TMath::Cos(phi);
-               Double_t py2 =   pt2 * TMath::Sin(phi);     
+               Double_t px1 =   pt1 * TMath::Cos(phis);
+               Double_t py1 =   pt1 * TMath::Sin(phis);            
+               Double_t px2 =   pt2 * TMath::Cos(phis);
+               Double_t py2 =   pt2 * TMath::Sin(phis);            
                
                fPyjets->P[0][iGlu] = px1;
                fPyjets->P[1][iGlu] = py1;