missing commits

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

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index 3b42fc9f996d3fd60be947310b693da2f0e1bfa2..bc35f381073284fff7bb77af4475d121102f6114 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -33,6 +33,9 @@
 
 #include "AliGenExtFile.h"
 #include "AliRunLoader.h"
+#include "AliHeader.h"
+#include "AliStack.h"
+#include "AliGenEventHeader.h"
 
 #include <TParticle.h>
 #include <TFile.h>
@@ -42,30 +45,26 @@
 ClassImp(AliGenExtFile)
 
 AliGenExtFile::AliGenExtFile()
-  :AliGenMC()
+    :AliGenMC(),
+     fFileName(0),
+     fReader(0)
 {
 //  Constructor
 //
 //  Read all particles
     fNpart  =- 1;
-    fReader =  0;
 }
 
 AliGenExtFile::AliGenExtFile(Int_t npart)
-    :AliGenMC(npart)
+    :AliGenMC(npart),
+     fFileName(0),
+     fReader(0)
 {
 //  Constructor
     fName   = "ExtFile";
     fTitle  = "Primaries from ext. File";
-    fReader = 0;
 }
 
-AliGenExtFile::AliGenExtFile(const AliGenExtFile & ExtFile):
-    AliGenMC(ExtFile)
-{
-// Copy constructor
-    ExtFile.Copy(*this);
-}
 //____________________________________________________________
 AliGenExtFile::~AliGenExtFile()
 {
@@ -85,10 +84,10 @@ 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 p[4];
   Float_t random[6];
   Int_t i = 0, j, nt;
   //
@@ -135,14 +134,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);
@@ -152,19 +154,29 @@ 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();
        }
+       Double_t tof = 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], tof,
+                 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(fNprimaries);
+    header->SetPrimaryVertex(fVertex);
+    AddHeader(header);
     break;
     
   } // event loop
@@ -176,29 +188,10 @@ void AliGenExtFile::Generate()
 void AliGenExtFile::CdEventFile()
 {
 // CD back to the event file
-    (AliRunLoader::GetRunLoader())->CdGAFile();
+  AliRunLoader::Instance()->CdGAFile();
 }
 
 
-AliGenExtFile& AliGenExtFile::operator=(const  AliGenExtFile& rhs)
-{
-// Assignment operator
-    rhs.Copy(*this);
-    return *this;
-}
- 
-
-void AliGenExtFile::Copy(TObject&) const
-{
-    //
-    // Copy 
-    //
-    Fatal("Copy","Not implemented!\n");
-}
-
-
-
-