X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenHalo.cxx;h=8fb4b372aa9cada1233382067c3f82def2d9a6b7;hb=f01724f790df5b9432d57bac2158938ef17f3b16;hp=9bf8de4fcdad350a53eccc51eb8a67db75fb23b2;hpb=803d1ab0e2c9c9a8116c05954c3d3cdcf1f33759;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx
index 9bf8de4fcda..8fb4b372aa9 100644
--- 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,15 +55,8 @@ AliGenHalo::AliGenHalo(Int_t npart)
 //
 //  Read all particles
     fNpart=-1;
-    fp=0;
 }
 
-AliGenHalo::AliGenHalo(const AliGenHalo & Halo)
-{
-// copy constructor
-}
-
-
 //____________________________________________________________
 AliGenHalo::~AliGenHalo()
 {
@@ -76,7 +73,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,25 +117,18 @@ 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];
   }
 }
  
 
-AliGenHalo& AliGenHalo::operator=(const  AliGenHalo& rhs)
-{
-// Assignment operator
-    return *this;
-}
-
-