Introducing the interaction time into the aliroot generators. In case of gaussian...

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

diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx
index caa8ebe185d19ea0a828c06f703e7b30ef174862..737b0cd4dd559ac3bf618161b1e2c3af2171ab35 100644 (file)
--- a/EVGEN/AliGenHIJINGpara.cxx
+++ b/EVGEN/AliGenHIJINGpara.cxx
@@ -58,15 +58,9 @@
 ClassImp(AliGenHIJINGpara)
 
 
-AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para):
-    AliGenerator(para)
-{
-// Copy constructor
-    para.Copy(*this);
-}
 
 //_____________________________________________________________________________
-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
@@ -164,40 +158,46 @@ static Double_t etakac( Double_t *py, Double_t *)
 
 //_____________________________________________________________________________
 AliGenHIJINGpara::AliGenHIJINGpara()
-  :AliGenerator()
+    :AliGenerator(),
+       fNt(-1),
+       fNpartProd(0),
+       fPi0Decays(kFALSE),
+       fPtWgtPi(0.),
+       fPtWgtKa(0.),
+       fPtpi(0),
+       fPtka(0),
+       fETApic(0),
+       fETAkac(0),
+       fDecayer(0)
 {
     //
     // Default constructor
     //
-    fPtpi    =  0;
-    fPtka    =  0;
-    fETApic  =  0;
-    fETAkac  =  0;
-    fDecayer =  0;
-    fNt      = -1;
     SetCutVertexZ();
     SetPtRange();
-    SetPi0Decays();
 }
 
 //_____________________________________________________________________________
 AliGenHIJINGpara::AliGenHIJINGpara(Int_t npart)
-  :AliGenerator(npart)
+    :AliGenerator(npart),
+       fNt(-1),
+       fNpartProd(npart),
+       fPi0Decays(kFALSE),
+       fPtWgtPi(0.),
+       fPtWgtKa(0.),
+       fPtpi(0),
+       fPtka(0),
+       fETApic(0),
+       fETAkac(0),
+       fDecayer(0)
 {
   // 
   // Standard constructor
   //
     fName="HIJINGpara";
     fTitle="HIJING Parametrisation Particle Generator";
-    fPtpi    =  0;
-    fPtka    =  0;
-    fETApic  =  0;
-    fETAkac  =  0;
-    fDecayer =  0;
-    fNt      = -1;
     SetCutVertexZ();
     SetPtRange();
-    SetPi0Decays();
 }
 
 //_____________________________________________________________________________
@@ -258,17 +258,17 @@ void AliGenHIJINGpara::Init()
     Float_t phiFrac    = (fPhiMax-fPhiMin)/2/TMath::Pi();
 
     
-    fParentWeight = Float_t(fNpart)/(intETASel*ptFrac*phiFrac);
+    fParentWeight = (intETASel*ptFrac*phiFrac) / Float_t(fNpart);
     
     if (fAnalog != 0) {
        fPtWgtPi = (fPtMax - fPtMin) / fPtpi->Integral(0., 20.);
        fPtWgtKa = (fPtMax - fPtMin) / fPtka->Integral(0., 20.);
-       fParentWeight = Float_t(fNpart)/(intETASel*phiFrac);
+       fParentWeight = (intETASel*phiFrac) / Float_t(fNpart);
     }
     
     
     AliInfo(Form("The number of particles in the selected kinematic region corresponds to %f percent of a full event", 
-                100.*fParentWeight));
+                100./ fParentWeight));
 
 // Issue warning message if etaMin or etaMax are outside the alowed range 
 // of the parametrization
@@ -281,6 +281,13 @@ void AliGenHIJINGpara::Init()
 //
     if (fPi0Decays && gMC)
        fDecayer = gMC->GetDecayer();
+
+    if (fPi0Decays)
+    {
+       fDecayer->SetForceDecay(kNeutralPion);
+       fDecayer->Init();
+    }
+    
 }
 
 
@@ -300,6 +307,7 @@ void AliGenHIJINGpara::Generate()
     const Int_t kKaons[4] = {kK0Long, kK0Short, kKPlus, kKMinus};
     //
     Float_t origin[3];
+    Float_t time;
     Float_t pt, pl, ptot, wgt;
     Float_t phi, theta;
     Float_t p[3];
@@ -311,16 +319,19 @@ void AliGenHIJINGpara::Generate()
     Float_t random[6];
     //
     for (j=0;j<3;j++) origin[j]=fOrigin[j];
+    time = fTimeOrigin;
 
     if(fVertexSmear == kPerEvent) {
        Vertex();
        for (j=0; j < 3; j++) origin[j] = fVertex[j];
+       time = fTime;
     } // 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) {
@@ -359,8 +370,12 @@ void AliGenHIJINGpara::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]));
            }
-           
+
            if (fAnalog == 0) { 
                wgt = fParentWeight;
            } else {
@@ -371,11 +386,13 @@ void AliGenHIJINGpara::Generate()
            if (part == kPi0 && fPi0Decays){
 //
 //          Decay pi0 if requested
-               PushTrack(0,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+               PushTrack(0,-1,part,p,origin,polar,time,kPPrimary,fNt,wgt);
                KeepTrack(fNt);
-               DecayPi0(origin, p);
+               DecayPi0(origin, p, time);
            } else {
-               PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+      // printf("fNt %d", fNt);
+               PushTrack(fTrackIt,-1,part,p,origin,polar,time,kPPrimary,fNt,wgt);
+
                KeepTrack(fNt);
            }
 
@@ -389,6 +406,8 @@ void AliGenHIJINGpara::Generate()
     AliGenEventHeader* header = new AliGenEventHeader("HIJINGparam");
 // Event Vertex
     header->SetPrimaryVertex(eventVertex);
+    header->SetInteractionTime(eventTime);
+    header->SetNProduced(fNpartProd);
     gAlice->SetGenEventHeader(header); 
 }
 
@@ -396,7 +415,7 @@ void AliGenHIJINGpara::SetPtRange(Float_t ptmin, Float_t ptmax) {
     AliGenerator::SetPtRange(ptmin, ptmax);
 }
 
-void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) 
+void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p, Float_t time) 
 {
 //
 //    Decay the pi0
@@ -417,7 +436,8 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
 //
     Float_t polar[3] = {0., 0., 0.};
     Int_t np = fDecayer->ImportParticles(particles);
-    Int_t nt;    
+    fNpartProd += (np-1);
+    Int_t nt = 0;    
     for (Int_t i = 1; i < np; i++)
     {
        TParticle* iParticle =  (TParticle *) particles->At(i);
@@ -426,18 +446,12 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
        p[2] = iParticle->Pz();
        Int_t part = iParticle->GetPdgCode();
 
-       PushTrack(fTrackIt, fNt, part, p, orig, polar, 0, kPDecay, nt, fParentWeight);
+       PushTrack(fTrackIt, fNt, part, p, orig, polar, time, kPDecay, nt, fParentWeight);
        KeepTrack(nt);
     }
     fNt = nt;
 }
 
-void AliGenHIJINGpara::Copy(TObject &) const
-{
-  Fatal("Copy","Not implemented!\n");
-}
-
-
 void AliGenHIJINGpara::Draw( const char * /*opt*/)
 {
     //