Shadowing of variabled corrected.

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index 2aedd6428086686f4e67fc0a1deb6c7ae8f99a8d..b9fa2c85485787ce17bcb0219160a4808713e9ed 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -42,7 +42,7 @@ AliGenCocktailEntry::AliGenCocktailEntry():
 }
 
 AliGenCocktailEntry:: AliGenCocktailEntry
-(AliGenerator* Generator, const char * Name, Float_t RateExp):TNamed(Name, "Generator Cocktail Entry"),
+(AliGenerator* Generator, const char* Name, Float_t RateExp):TNamed(Name, "Generator Cocktail Entry"),
     fGenerator(Generator),
     fNGenerated(0),
     fFirst(-1),

diff --git a/EVGEN/AliGenDoubleScan.cxx b/EVGEN/AliGenDoubleScan.cxx
index 778ad96a17a33cd6580dbf46df7392cefffe6be6..c10bfc0cf84f007f83f702659f7cba1c2f6e0611 100644 (file)
--- a/EVGEN/AliGenDoubleScan.cxx
+++ b/EVGEN/AliGenDoubleScan.cxx
@@ -102,10 +102,10 @@ void AliGenDoubleScan::Generate()
 //
              Rndm(random,6);
              Float_t phi2=2.*TMath::Pi()*random[0];
-             Float_t dx  =fDistance*TMath::Sin(phi2);
-             Float_t dy  =fDistance*TMath::Cos(phi2);        
-             origin[0]=origin[0]+dx;
-             origin[1]=origin[1]+dy;         
+             Float_t dx2  =fDistance*TMath::Sin(phi2);
+             Float_t dy2  =fDistance*TMath::Cos(phi2);       
+             origin[0]=origin[0]+dx2;
+             origin[1]=origin[1]+dy2;        
              pmom=fPMin+random[1]*(fPMax-fPMin);
              theta=fThetaMin+random[2]*(fThetaMax-fThetaMin);
              phi=fPhiMin+random[3]*(fPhiMax-fPhiMin);

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index 891ebf8eb582c064b72e44d04fc92860eb24bbae..dac8c078acdc7415489d78193ea710942acacd25 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -135,12 +135,12 @@ void AliGenExtFile::Generate()
     //
     fNprimaries = 0;
     for (i = 0; i < nTracks; i++) {
-       TParticle* iparticle = fReader->NextParticle();
-       Bool_t selected = KinematicSelection(iparticle,0); 
+       TParticle* jparticle = fReader->NextParticle();
+       Bool_t selected = KinematicSelection(jparticle,0); 
        if (!selected) continue;
-       p[0] = iparticle->Px();
-       p[1] = iparticle->Py();
-       p[2] = iparticle->Pz();
+       p[0] = jparticle->Px();
+       p[1] = jparticle->Py();
+       p[2] = jparticle->Pz();
        Int_t idpart = iparticle->GetPdgCode();
        if(fVertexSmear==kPerTrack) 
        {
@@ -151,16 +151,16 @@ void AliGenExtFile::Generate()
                    TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
            }
        } else {
-           origin[0] = fVertex[0] + iparticle->Vx();
-           origin[1] = fVertex[1] + iparticle->Vy();
-           origin[2] = fVertex[2] + iparticle->Vz();
+           origin[0] = fVertex[0] + jparticle->Vx();
+           origin[1] = fVertex[1] + jparticle->Vy();
+           origin[2] = fVertex[2] + jparticle->Vz();
        }
        
-       Int_t decayed    = iparticle->GetFirstDaughter();
+       Int_t decayed    = jparticle->GetFirstDaughter();
        Int_t doTracking = fTrackIt && (decayed < 0) && (TMath::Abs(idpart) > 10) && selected;
-       Int_t parent     = iparticle->GetFirstMother();
+       Int_t parent     = jparticle->GetFirstMother();
        
-       PushTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt);
+       PushTrack(doTracking, parent, idpart, p, origin, polar, 0, kPPrimary, nt);
        KeepTrack(nt);
        fNprimaries++;
     } // track loop

diff --git a/EVGEN/AliGenHBTosl.cxx b/EVGEN/AliGenHBTosl.cxx
index cf0610377b22ead3cfe335842151a30d5c8632c8..1dd0529440c44a01d3731e6cd0682af01844458f 100644 (file)
--- a/EVGEN/AliGenHBTosl.cxx
+++ b/EVGEN/AliGenHBTosl.cxx
@@ -373,7 +373,7 @@ void AliGenHBTosl::Generate()
   }
  
  fGenerator->Generate();
- Int_t j = 0, ntr = 0;
+ Int_t ntr = 0;
  if ( genstack->GetNtrack() < fNpart/2)
   {
     Warning("Generate","************************************************************");
@@ -528,9 +528,11 @@ void AliGenHBTosl::Generate()
      qlong = gRandom->Uniform(qlongc-binwdh, qlongc+binwdh);
 
      TParticle* first = 0;
-     while (j < genstack->GetNtrack())
+     Int_t jj = 0;
+     
+     while (jj < genstack->GetNtrack())
       {
-        TParticle* tmpp = genstack->Particle(j++);
+        TParticle* tmpp = genstack->Particle(jj++);
         if (tmpp->GetPdgCode() == fPID)
          {
            if (CheckParticle(tmpp,0x0,stack) == kFALSE)
@@ -1290,7 +1292,7 @@ void AliGenHBTosl::StartSignalPass1()
     
     for (Int_t k = 1; k<=fQNBins; k++)
       {
-       for (Int_t j = 1; j<=fQNBins; j++)
+       for (j = 1; j<=fQNBins; j++)
          {  
            for (Int_t i = 1; i<=fQNBins; i++)
              {

diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx
index e9d8726e160cd7165021f4b88f21a25a1111c228..676eda211854e87860fd43a5fd53825560a31de3 100644 (file)
--- a/EVGEN/AliGenHaloProtvino.cxx
+++ b/EVGEN/AliGenHaloProtvino.cxx
@@ -196,12 +196,11 @@ void AliGenHaloProtvino::Init()
     Float_t sum1 = 0.;
     Float_t sum2 = 0.;
     
-    for (Int_t i = 0; i < 300; i++) {
-       Float_t z = 20.+i*1.;
-       z*=100;
-       Float_t wgt1 = GasPressureWeight(z);
-       Float_t wgt2 = GasPressureWeight(-z);
-//     printf("weight: %f %f %f %f %f \n", z, wgt1, wgt2, fZ1[20], fZ2[20]);
+    for (Int_t iz = 0; iz < 300; iz++) {
+       Float_t zpos = 20. + iz * 1.;
+       zpos *= 100;
+       Float_t wgt1 = GasPressureWeight( zpos);
+       Float_t wgt2 = GasPressureWeight(-zpos);
        sum1 += wgt1;
        sum2 += wgt2;
     }

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index ab0a0fcca525a11caa264a334e18b88d99d55c2a..2a5723c8a71c9aed4e8cb6190ba7b524b344e349 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -448,8 +448,8 @@ void AliGenParam::Generate()
                  for (i = 1; i < np; i++) {
                      if (pSelected[i]) {
                          TParticle* iparticle = (TParticle *) particles->At(i);
-                         Int_t kf  = iparticle->GetPdgCode();
-                         Int_t ipa = iparticle->GetFirstMother()-1;
+                         Int_t kf   = iparticle->GetPdgCode();
+                         Int_t jpa  = iparticle->GetFirstMother()-1;
                          
                          och[0] = origin0[0]+iparticle->Vx()/10;
                          och[1] = origin0[1]+iparticle->Vy()/10;
@@ -458,13 +458,13 @@ void AliGenParam::Generate()
                          pc[1]  = iparticle->Py();
                          pc[2]  = iparticle->Pz();
                          
-                         if (ipa > -1) {
-                             iparent = pParent[ipa];
+                         if (jpa > -1) {
+                             iparent = pParent[jpa];
                          } else {
                              iparent = -1;
                          }
                         
-                         PushTrack(fTrackIt*trackIt[i], iparent, kf,
+                         PushTrack(fTrackIt * trackIt[i], iparent, kf,
                                           pc, och, polar,
                                           0, kPDecay, nt, wgtch);
                          pParent[i] = nt;