Wrong comments removed from file

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

diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx
index 955986a65e7d4c1c9828c2a302b93af2a8c43e71..d1530450a7635f2369e3c42994ae88452fb66956 100644 (file)
--- a/EVGEN/AliGenHalo.cxx
+++ b/EVGEN/AliGenHalo.cxx
@@ -1,8 +1,33 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+Revision 1.4  1999/09/29 09:24:14  fca
+Introduction of the Copyright and cvs Log
+
+*/
+
 #include "AliGenHalo.h"
 #include "AliGenMUONlib.h"
 #include "AliMC.h"
 #include "AliRun.h"
+#include "AliPDG.h"
+
 #include <TDirectory.h>
+#include <TDatabasePDG.h>
 #include <TFile.h>
 #include <TTree.h>
 #include <stdlib.h>
@@ -45,7 +70,6 @@ void AliGenHalo::Init()
 //____________________________________________________________
 void AliGenHalo::Generate()
 {
-  AliMC* pMC = AliMC::GetMC();
     FILE *fp = fopen(fFileName,"r");
     if (fp) {
        printf("\n File %s opened for reading ! \n ", fFileName);
@@ -54,16 +78,17 @@ void AliGenHalo::Generate()
     }
 //
 // MARS particle codes
- const Int_t imars[12]={0,14, 13, 8, 9, 11, 12, 5, 6, 1, 3, 2};
+    // const Int_t imars[12]={0,14, 13, 8, 9, 11, 12, 5, 6, 1, 3, 2};
+  const Int_t imars[12]={0,kProton,kNeutron,kPiPlus,kPiMinus,kKPlus,kKMinus,
+                        kMuonPlus,kMuonMinus,kGamma,kElectron,kPositron};
  
   Float_t polar[3]= {0,0,0};
   Float_t origin[3];
   Float_t p[3], p0;
   Float_t ekin, wgt, tx, ty, tz, txy;
-  Float_t amass, charge, tlife;
-  char name[100];
+  Float_t amass;
   //
-  Int_t ipart, itrtyp, ncols, nt;
+  Int_t ipart, ncols, nt;
   
   Int_t nread=0;
   origin[2]=2650;
@@ -77,8 +102,7 @@ void AliGenHalo::Generate()
       nread++;
       if (fNpart !=-1 && nread > fNpart) break;
       ipart = imars[ipart];
-      pMC->Gfpart(ipart, name, itrtyp,  
-                 amass, charge, tlife); 
+      amass = TDatabasePDG::Instance()->GetParticle(ipart)->Mass();
       p0=sqrt(ekin*ekin + 2.*amass);
       
       txy=TMath::Sqrt(tx*tx+ty*ty);
@@ -91,10 +115,10 @@ void AliGenHalo::Generate()
       p[1]=p0*ty;
       p[2]=p0*tz;
       fParentWeight=wgt;
-      gAlice->SetTrack(1,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
+      gAlice->SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo+",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
-      gAlice->SetTrack(1,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
+      gAlice->SetTrack(fTrackIt,-1,ipart,p,origin,polar,0,"Halo-",nt,fParentWeight);
       origin[2]=-origin[2];
       p[2]=-p[2];
   }