Removing try/catch-es

[u/mrichter/AliRoot.git] / EVGEN / AliGenExtFile.cxx

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index a123e7e1f8383383c034217d89a52b3a6a9fc6fc..8821335bfacf065b217f8d827aa95b675f2371bd 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -34,7 +34,9 @@
 #include "AliGenExtFile.h"
 #include "AliRunLoader.h"
 #include "AliHeader.h"
+#include "AliStack.h"
 #include "AliGenEventHeader.h"
+#include "AliGenReader.h"
 
 #include <TParticle.h>
 #include <TFile.h>
@@ -51,7 +53,7 @@ AliGenExtFile::AliGenExtFile()
 //  Constructor
 //
 //  Read all particles
-    fNpart  =- 1;
+    fNpart  = -1;
 }
 
 AliGenExtFile::AliGenExtFile(Int_t npart)
@@ -83,10 +85,11 @@ void AliGenExtFile::Generate()
 {
 // Generate particles
 
-  Float_t polar[3]  = {0,0,0};
+  Double_t polar[3]  = {0,0,0};
   //
-  Float_t origin[3] = {0,0,0};
-  Float_t p[3];
+  Double_t origin[3] = {0,0,0};
+  Double_t time = 0.;
+  Double_t p[4];
   Float_t random[6];
   Int_t i = 0, j, nt;
   //
@@ -133,14 +136,17 @@ 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();
-       Int_t idpart = iparticle->GetPdgCode();
+       p[0] = jparticle->Px();
+       p[1] = jparticle->Py();
+       p[2] = jparticle->Pz();
+       p[3] = jparticle->Energy();
+       
+       Int_t idpart = jparticle->GetPdgCode();
        if(fVertexSmear==kPerTrack) 
        {
            Rndm(random,6);
@@ -149,27 +155,35 @@ void AliGenExtFile::Generate()
                    fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())*
                    TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
            }
+           Rndm(random,2);
+           time = fTimeOrigin + fOsigma[2]/TMath::Ccgs()*
+             TMath::Cos(2*random[0]*TMath::Pi())*
+             TMath::Sqrt(-2*TMath::Log(random[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();
+           time = fTime + jparticle->T();
        }
+       Int_t doTracking = fTrackIt && selected && (jparticle->TestBit(kTransportBit));
+       Int_t parent     = jparticle->GetFirstMother();
        
-       Int_t decayed    = iparticle->GetFirstDaughter();
-       Int_t doTracking = fTrackIt && (decayed < 0) && (TMath::Abs(idpart) > 10) && selected;
-       Int_t parent     = iparticle->GetFirstMother();
-       
-       PushTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt);
+       PushTrack(doTracking, parent, idpart,
+                 p[0], p[1], p[2], p[3], origin[0], origin[1], origin[2], time,
+                 polar[0], polar[1], polar[2],
+                 kPPrimary, nt, 1., jparticle->GetStatusCode());
+
        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);
-
+    header->SetInteractionTime(fTime);
+    AddHeader(header);
     break;
     
   } // event loop
@@ -181,7 +195,7 @@ void AliGenExtFile::Generate()
 void AliGenExtFile::CdEventFile()
 {
 // CD back to the event file
-    (AliRunLoader::GetRunLoader())->CdGAFile();
+  AliRunLoader::Instance()->CdGAFile();
 }