changes from Misha

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

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index d0ae8b91df4fc8bfa9349d21adaba6f1546dd600..b1d0a38f88f5f9c174378a956ac9b469cc86d75d 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -36,6 +36,7 @@
 #include "AliHeader.h"
 #include "AliStack.h"
 #include "AliGenEventHeader.h"
+#include "AliGenReader.h"
 
 #include <TParticle.h>
 #include <TFile.h>
@@ -47,18 +48,20 @@ ClassImp(AliGenExtFile)
 AliGenExtFile::AliGenExtFile()
     :AliGenMC(),
      fFileName(0),
-     fReader(0)
+     fReader(0),
+     fStartEvent(0)
 {
 //  Constructor
 //
 //  Read all particles
-    fNpart  =- 1;
+    fNpart  = -1;
 }
 
 AliGenExtFile::AliGenExtFile(Int_t npart)
     :AliGenMC(npart),
      fFileName(0),
-     fReader(0)
+     fReader(0),
+     fStartEvent(0)
 {
 //  Constructor
     fName   = "ExtFile";
@@ -79,21 +82,35 @@ void AliGenExtFile::Init()
     if (fReader) fReader->Init();
 }
 
-    
+//___________________________________________________________
 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;
   //
   //
   if (fVertexSmear == kPerEvent) Vertex();
 
+  // Fast forward up to start Event
+  for (Int_t ie=0; ie<fStartEvent; ++ie ) {
+    Int_t nTracks = fReader->NextEvent();      
+    if (nTracks == 0) {
+      // printf("\n No more events !!! !\n");
+      Warning("AliGenExtFile::Generate","\nNo more events in external file!!!\nLast event may be empty or incomplete.\n");
+      return;
+    }
+    TParticle* iparticle = 0x0;
+    while ((iparticle=fReader->NextParticle()) ) ;
+    cout << "Skipping event " << ie << endl;
+  }  
+
   while(1) {
     Int_t nTracks = fReader->NextEvent();      
     if (nTracks == 0) {
@@ -142,6 +159,8 @@ void AliGenExtFile::Generate()
        p[0] = jparticle->Px();
        p[1] = jparticle->Py();
        p[2] = jparticle->Pz();
+       p[3] = jparticle->Energy();
+       
        Int_t idpart = jparticle->GetPdgCode();
        if(fVertexSmear==kPerTrack) 
        {
@@ -151,16 +170,24 @@ 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] + 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(kDoneBit));
+       Int_t doTracking = fTrackIt && selected && (jparticle->TestBit(kTransportBit));
        Int_t parent     = jparticle->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
@@ -170,6 +197,7 @@ void AliGenExtFile::Generate()
     AliGenEventHeader * header = new AliGenEventHeader();
     header->SetNProduced(fNprimaries);
     header->SetPrimaryVertex(fVertex);
+    header->SetInteractionTime(fTime);
     AddHeader(header);
     break;
     
@@ -179,10 +207,11 @@ void AliGenExtFile::Generate()
   CdEventFile();
 }
 
+//___________________________________________________________
 void AliGenExtFile::CdEventFile()
 {
 // CD back to the event file
-    (AliRunLoader::GetRunLoader())->CdGAFile();
+  AliRunLoader::Instance()->CdGAFile();
 }