track matching macros from Alberto

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

diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx
index 9bf8de4fcdad350a53eccc51eb8a67db75fb23b2..f69483c565866b4bdd0f094dba45dd0a72f594b8 100644 (file)
--- a/EVGEN/AliGenHalo.cxx
+++ b/EVGEN/AliGenHalo.cxx
@@ -29,9 +29,12 @@
 #include "AliGenHalo.h"
 #include "AliRun.h"
 
- ClassImp(AliGenHalo)
-     AliGenHalo::AliGenHalo()
-        :AliGenerator(-1)
+ClassImp(AliGenHalo)
+
+AliGenHalo::AliGenHalo()
+    :AliGenerator(-1),
+     fp(0),
+     fFileName(0)
 {
 // Constructor
     fName="Halo";
@@ -39,11 +42,12 @@
 //
 //  Read all particles
     fNpart=-1;
-    fp=0;
 }
 
 AliGenHalo::AliGenHalo(Int_t npart)
-    :AliGenerator(npart)
+    :AliGenerator(npart),
+     fp(0),
+     fFileName(0)
 {
 // Constructor
     fName="Halo";
@@ -51,12 +55,15 @@ AliGenHalo::AliGenHalo(Int_t npart)
 //
 //  Read all particles
     fNpart=-1;
-    fp=0;
 }
 
 AliGenHalo::AliGenHalo(const AliGenHalo & Halo)
+    :AliGenerator(Halo),
+     fp(0),
+     fFileName(0)
 {
-// copy constructor
+// Copy constructor
+    Halo.Copy(*this);
 }
 
 
@@ -76,7 +83,7 @@ void AliGenHalo::Init()
 void AliGenHalo::Generate()
 {
 // Generate from input file
-    FILE *fp = fopen(fFileName,"r");
+    fp = fopen(fFileName,"r");
     if (fp) {
        printf("\n File %s opened for reading ! \n ", (char*) &fFileName);
     } else {
@@ -120,12 +127,12 @@ void AliGenHalo::Generate()
       p[1]=p0*ty;
       p[2]=p0*tz;
       fParentWeight=wgt;
-      SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
-//    SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
+      PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
+//    PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
-      SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
-//    SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
+      PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,kPNoProcess,nt,fParentWeight);
+//    PushTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
   }
@@ -135,10 +142,20 @@ void AliGenHalo::Generate()
 AliGenHalo& AliGenHalo::operator=(const  AliGenHalo& rhs)
 {
 // Assignment operator
+    rhs.Copy(*this);
     return *this;
 }
 
 
+void AliGenHalo::Copy(TObject&) const
+{
+    //
+    // Copy 
+  //
+    Fatal("Copy","Not implemented!\n");
+}
+
+