X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenHIJINGparaBa.cxx;h=9d80934fed10d350929d1269c91694954753822d;hb=26428fe757714b208d115cbc49ad4cfbfb87e825;hp=683ad4c7b6b095186424061a25f5822d86314751;hpb=2a336e15cdc6ee89450a095e8d57927415e1e12c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenHIJINGparaBa.cxx b/EVGEN/AliGenHIJINGparaBa.cxx
index 683ad4c7b6b..9d80934fed1 100644
--- a/EVGEN/AliGenHIJINGparaBa.cxx
+++ b/EVGEN/AliGenHIJINGparaBa.cxx
@@ -35,7 +35,7 @@
 ClassImp(AliGenHIJINGparaBa)
 
 
-static Double_t ptpi(Double_t *px, Double_t *)
+static Double_t ptpi(const Double_t *px, const Double_t *)
 {
   //
   //     PT-PARAMETERIZATION CDF, PRL 61(88) 1819
@@ -153,34 +153,28 @@ static Double_t etakac( Double_t *py, Double_t *)
 }
 
 AliGenHIJINGparaBa::AliGenHIJINGparaBa()
-  :AliGenHIJINGpara()
+    :AliGenHIJINGpara(),
+     fPtba(0),
+     fETAba(0)
 {
     //
     // Default constructor
     //
     fName="HIGINGparaBa";
     fTitle="HIJING Parametrisation Particle Generator with Baryons";
-    fETAba = 0;
-    fPtba  = 0;
 }
 
 //_____________________________________________________________________________
 AliGenHIJINGparaBa::AliGenHIJINGparaBa(Int_t npart)
-  :AliGenHIJINGpara(npart)
+  :AliGenHIJINGpara(npart),
+     fPtba(0),
+     fETAba(0)
 {
   // 
   // Standard constructor
   //
     fName="HIGINGparaBa";
     fTitle="HIJING Parametrisation Particle Generator with Baryons";
-    fETAba = 0;
-    fPtba  = 0;
-}
-
-AliGenHIJINGparaBa::AliGenHIJINGparaBa(const AliGenHIJINGparaBa& para) : AliGenHIJINGpara(para)
-{
-// Copy constructor
-    para.Copy(*this);
 }
 
 //_____________________________________________________________________________
@@ -275,6 +269,7 @@ void AliGenHIJINGparaBa::Generate()
     const Int_t kBaryons[4] = {kProton, kProtonBar, kNeutron, kNeutronBar};
     //
     Float_t origin[3];
+    Float_t time;
     Float_t pt, pl, ptot;
     Float_t phi, theta;
     Float_t p[3];
@@ -286,6 +281,7 @@ void AliGenHIJINGparaBa::Generate()
     Float_t random[6];
     //
     for (j=0;j<3;j++) origin[j]=fOrigin[j];
+    time = fTimeOrigin;
 
     if(fVertexSmear == kPerEvent) {
 	Float_t dv[3];
@@ -298,12 +294,18 @@ void AliGenHIJINGparaBa::Generate()
 	    }
 	}
 	for (j=0; j < 3; j++) origin[j] += dv[j];
+
+	Rndm(random,2);
+	time += fOsigma[2]/TMath::Ccgs()*
+	  TMath::Cos(2*random[0]*TMath::Pi())*
+	  TMath::Sqrt(-2*TMath::Log(random[1]));
     } // if kPerEvent
     TArrayF eventVertex;
     eventVertex.Set(3);
     eventVertex[0] = origin[0];
     eventVertex[1] = origin[1];
     eventVertex[2] = origin[2];
+    Float_t eventTime = time;
 
     for(i=0;i<fNpart;i++) {
 	while(1) {
@@ -338,8 +340,13 @@ void AliGenHIJINGparaBa::Generate()
 		    origin[j]=fOrigin[j]+fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())*
 			TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
 		}
+
+		Rndm(random,2);
+		time = fTimeOrigin + fOsigma[2]/TMath::Ccgs()*
+		  TMath::Cos(2*random[0]*TMath::Pi())*
+		  TMath::Sqrt(-2*TMath::Log(random[1]));
 	    }
-	    PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,nt,fParentWeight);
+	    PushTrack(fTrackIt,-1,part,p,origin,polar,time,kPPrimary,nt,fParentWeight);
 	    break;
 	} // while(1)
     } // Particle loop
@@ -347,6 +354,7 @@ void AliGenHIJINGparaBa::Generate()
     AliGenEventHeader* header = new AliGenEventHeader("HIJINGparam");
 // Event Vertex
     header->SetPrimaryVertex(eventVertex);
+    header->SetInteractionTime(eventTime);
     gAlice->SetGenEventHeader(header); 
 }