X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenHIJINGpara.cxx;h=20cabde512d1f314a33e46c6629dc1a81cdc1158;hb=38e61c10bfb7b49309ed0cbd4ee6298b10533cf9;hp=71702a9ad8940568571e258c3b9edba5993fd9a3;hpb=ac3faee4980efbf9c8f8eeafc61770ffc45bb103;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx
index 71702a9ad89..20cabde512d 100644
--- a/EVGEN/AliGenHIJINGpara.cxx
+++ b/EVGEN/AliGenHIJINGpara.cxx
@@ -52,17 +52,12 @@
 #include "AliDecayer.h"
 #include "AliGenEventHeader.h"
 #include "AliGenHIJINGpara.h"
+#include "AliLog.h"
 #include "AliRun.h"
 
 ClassImp(AliGenHIJINGpara)
 
 
-AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para):
-    AliGenerator(para)
-{
-// Copy constructor
-    para.Copy(*this);
-}
 
 //_____________________________________________________________________________
 static Double_t ptpi(Double_t *px, Double_t *)
@@ -163,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();
 }
 
 //_____________________________________________________________________________
@@ -257,30 +258,36 @@ 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);
     }
     
     
-    printf("%s: The number of particles in the selected kinematic region corresponds to %f percent of a full event\n ", 
-	   ClassName(),100.*fParentWeight);
+    AliInfo(Form("The number of particles in the selected kinematic region corresponds to %f percent of a full event", 
+		 100./ fParentWeight));
 
 // Issue warning message if etaMin or etaMax are outside the alowed range 
 // of the parametrization
     if (etaMin < -8.001 || etaMax > 8.001) {
-	printf("\n \n WARNING FROM AliGenHIJINGPara !");
-	printf("\n YOU ARE USING THE PARAMETERISATION OUTSIDE ");	
-	printf("\n THE ALLOWED PSEUDORAPIDITY RANGE (-8. - 8.)");	    
-	printf("\n YOUR LIMITS: %f %f \n \n ", etaMin, etaMax);
+	AliWarning("\nYOU ARE USING THE PARAMETERISATION OUTSIDE ");	
+	AliWarning("THE ALLOWED PSEUDORAPIDITY RANGE (-8. - 8.)");	    
+	AliWarning(Form("YOUR LIMITS: %f %f \n ", etaMin, etaMax));
     }
 //
 //
     if (fPi0Decays && gMC)
 	fDecayer = gMC->GetDecayer();
+
+    if (fPi0Decays)
+    {
+	fDecayer->SetForceDecay(kNeutralPion);
+	fDecayer->Init();
+    }
+    
 }
 
 
@@ -360,7 +367,7 @@ void AliGenHIJINGpara::Generate()
 			TMath::Sqrt(-2*TMath::Log(random[2*j+1]));
 		}
 	    }
-	    
+
 	    if (fAnalog == 0) { 
 		wgt = fParentWeight;
 	    } else {
@@ -371,11 +378,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,0,kPPrimary,fNt,wgt);
 		KeepTrack(fNt);
 		DecayPi0(origin, p);
 	    } else {
-		PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,fParentWeight);
+      // printf("fNt %d", fNt);
+		PushTrack(fTrackIt,-1,part,p,origin,polar,0,kPPrimary,fNt,wgt);
+
 		KeepTrack(fNt);
 	    }
 
@@ -389,6 +398,7 @@ void AliGenHIJINGpara::Generate()
     AliGenEventHeader* header = new AliGenEventHeader("HIJINGparam");
 // Event Vertex
     header->SetPrimaryVertex(eventVertex);
+    header->SetNProduced(fNpartProd);
     gAlice->SetGenEventHeader(header); 
 }
 
@@ -417,6 +427,7 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
 //
     Float_t polar[3] = {0., 0., 0.};
     Int_t np = fDecayer->ImportParticles(particles);
+    fNpartProd += (np-1);
     Int_t nt;    
     for (Int_t i = 1; i < np; i++)
     {
@@ -432,12 +443,6 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p)
     fNt = nt;
 }
 
-void AliGenHIJINGpara::Copy(TObject &) const
-{
-  Fatal("Copy","Not implemented!\n");
-}
-
-
 void AliGenHIJINGpara::Draw( const char * /*opt*/)
 {
     //