X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=THijing%2FTHijing.cxx;h=58130406a1f148a27beca03f4411748b1c542050;hb=7e4d63b3c9b3a5e7187eecc960b3196e639c2966;hp=93e1a45f1ece22ddc2618d2293fd43af3fe9b59c;hpb=dd63ae117661e9e4e2c69de993f1ba78cf904388;p=u%2Fmrichter%2FAliRoot.git

diff --git a/THijing/THijing.cxx b/THijing/THijing.cxx
index 93e1a45f1ec..58130406a1f 100644
--- a/THijing/THijing.cxx
+++ b/THijing/THijing.cxx
@@ -1,3 +1,20 @@
+/**************************************************************************
+ * 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.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 // THijing                                                                    //
@@ -24,11 +41,13 @@
 //****************************************************************************//
 
 
-#include "THijing.h"
-#include "TObjArray.h"
+#include <TClonesArray.h>
+#include <TObjArray.h>
+#include <TParticle.h>
+#include <TROOT.h>
+
 #include "Hcommon.h"
-#include "TParticle.h"
-#include "TROOT.h"
+#include "THijing.h"
 
 #ifndef WIN32
 # define hijset hijset_
@@ -66,30 +85,43 @@ extern "C" void type_of_call rluset_hijing(Int_t & lfn, Int_t & move);
 
 ClassImp(THijing)
 
-THijing::THijing() : TGenerator("Hijing","Hijing")
+
+THijing::THijing(): 
+    TGenerator("Hijing","Hijing"),
+    fEfrm(5500.),
+    fFrame("CMS"),
+    fProj("A"),
+    fTarg("A"),
+    fIap(208),
+    fIzp(82),
+    fIat(208),
+    fIzt(82),
+    fBmin(0.),
+    fBmax(5.)
 {
 // Default constructor 
 }
 
 //______________________________________________________________________________
 THijing::THijing(Float_t efrm, const char *frame="CMS", 
-	const char *proj="A", const char *targ="A", Int_t iap=207, 
-	Int_t izp=82, Int_t iat=207, Int_t izt=82, Float_t bmin=0, 
-	Float_t bmax=20) : TGenerator("Hijing","Hijing")
+		 const char *proj="A", const char *targ="A", 
+		 Int_t iap=207, Int_t izp=82, Int_t iat=207, Int_t izt=82,
+		 Float_t bmin=0, Float_t bmax=20): 
+    TGenerator("Hijing","Hijing"),
+    fEfrm(efrm),
+    fFrame(frame),
+    fProj(proj),
+    fTarg(targ),
+    fIap(iap),
+    fIzp(izp),
+    fIat(iat),
+    fIzt(izt),
+    fBmin(bmin),
+    fBmax(bmax)
 {
 // THijing constructor: 
 // Note that there may be only one functional THijing object
 // at a time, so it's not use to create more than one instance of it.
-      fEfrm=efrm;
-      fFrame=frame;
-      fProj=proj;
-      fTarg=targ;
-      fIap=iap;
-      fIzp=izp;
-      fIat=iat;
-      fIzt=izt;
-      fBmin=bmin;
-      fBmax=bmax;
 }
 
 //______________________________________________________________________________
@@ -127,11 +159,12 @@ TObjArray* THijing::ImportParticles(Option_t *option)
 //
 		nump++;
 		TParticle* p = new TParticle(
-		    HIMAIN2.katt[0][i], HIMAIN2.katt[1][i] ,
+		    HIMAIN2.katt[0][i], HIMAIN2.katt[3][i] ,
 		    -1, -1, -1, -1,
 		    HIMAIN2.patt[0][i], HIMAIN2.patt[1][i], HIMAIN2.patt[2][i], HIMAIN2.patt[3][i] ,
 		    HIMAIN2.vatt[0][i], HIMAIN2.vatt[1][i], HIMAIN2.vatt[2][i], HIMAIN2.vatt[3][i] 
 		  );
+		p->SetUniqueID(HIMAIN2.katt[1][i]);
 		fParticles->Add(p);
 	    }
 	}
@@ -150,11 +183,12 @@ TObjArray* THijing::ImportParticles(Option_t *option)
 	    }
 	    
 	    TParticle* p = new TParticle(
-		HIMAIN2.katt[0][i], HIMAIN2.katt[1][i], iParent,
+		HIMAIN2.katt[0][i], HIMAIN2.katt[3][i], iParent,
 		-1, -1, -1,
 		HIMAIN2.patt[0][i], HIMAIN2.patt[1][i], HIMAIN2.patt[2][i], HIMAIN2.patt[3][i] ,
 		HIMAIN2.vatt[0][i], HIMAIN2.vatt[1][i], HIMAIN2.vatt[2][i], HIMAIN2.vatt[3][i]
 		);
+	    p->SetUniqueID(HIMAIN2.katt[1][i]);
 	    fParticles->Add(p);
 	}
     }
@@ -192,7 +226,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option)
 	    nump++;
 	    new(particlesR[i]) TParticle(
 		  HIMAIN2.katt[0][i] ,
-		  HIMAIN2.katt[1][i] ,
+		  HIMAIN2.katt[3][i] ,
 		  -1 ,
 		  -1,
 		  -1,
@@ -208,6 +242,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option)
 		  HIMAIN2.vatt[2][i] ,
 		  HIMAIN2.vatt[3][i] 
 		  );
+	    particlesR[i]->SetUniqueID(HIMAIN2.katt[1][i]);
 	  }
       }
   }
@@ -226,7 +261,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option)
 
 	  new(particlesR[i]) TParticle(
 	      HIMAIN2.katt[0][i] ,
-	      HIMAIN2.katt[1][i] ,
+	      HIMAIN2.katt[3][i] ,
 	      iParent,
 	      -1,
 	      -1,
@@ -242,6 +277,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option)
 	      HIMAIN2.vatt[2][i] ,
 	      HIMAIN2.vatt[3][i]
 	      );
+	  particlesR[i]->SetUniqueID(HIMAIN2.katt[1][i]);
       }
   }
   return nump;