]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - EVGEN/AliGenExtFile.cxx
Shadowing of variabled corrected.
[u/mrichter/AliRoot.git] / EVGEN / AliGenExtFile.cxx
index a123e7e1f8383383c034217d89a52b3a6a9fc6fc..dac8c078acdc7415489d78193ea710942acacd25 100644 (file)
@@ -133,13 +133,14 @@ void AliGenExtFile::Generate()
     //
     // Stack filling loop
     //
+    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) 
        {
@@ -150,26 +151,26 @@ 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
 
     // Generated event header
     
     AliGenEventHeader * header = new AliGenEventHeader();
-    header->SetNProduced(nt+1);
+    header->SetNProduced(fNprimaries);
     header->SetPrimaryVertex(fVertex);
-    AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header);
-
+    AddHeader(header);
     break;
     
   } // event loop