X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PYTHIA6%2FAliGenPythiaPlus.cxx;h=4a19b5fc1627a53e29b0e2f735334ba5b33be3bf;hb=dcc60657b357cc833961e5204d55578b6b38e753;hp=1b5598ade5720376415b8060673bfbf6c0de1848;hpb=3e54fb8cee40236e31fd0e430b95fb3c0a46d48b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx
index 1b5598ade57..4a19b5fc162 100644
--- a/PYTHIA6/AliGenPythiaPlus.cxx
+++ b/PYTHIA6/AliGenPythiaPlus.cxx
@@ -497,9 +497,9 @@ void AliGenPythiaPlus::Generate()
     
     fDecayer->ForceDecay();
 
-    Float_t polar[3]   =   {0,0,0};
-    Float_t origin[3]  =   {0,0,0};
-    Float_t p[4];
+    Double_t polar[3]   =   {0,0,0};
+    Double_t origin[3]  =   {0,0,0};
+    Double_t p[4];
 //  converts from mm/c to s
     const Float_t kconv=0.001/2.999792458e8;
 //
@@ -748,7 +748,7 @@ void AliGenPythiaPlus::Generate()
 		    origin[1] = fVertex[1]+iparticle->Vy()/10; // [cm]
 		    origin[2] = fVertex[2]+iparticle->Vz()/10; // [cm]
 		    
-		    Float_t tof   = kconv*iparticle->T();
+		    Float_t tof   = fTime + kconv*iparticle->T();
 		    Int_t ipa = (fPythia->Version() == 6) ? (iparticle->GetFirstMother() - 1) :(iparticle->GetFirstMother()) ;
 		    Int_t iparent = (ipa > -1) ? pParent[ipa] : -1;
  
@@ -856,8 +856,10 @@ Int_t  AliGenPythiaPlus::GenerateMB()
 	    }
 	}
       }
-      if(!ok)
-	return 0;
+      if(!ok){
+	  delete [] pParent;
+	  return 0;
+      }
     }
     
     
@@ -891,8 +893,10 @@ Int_t  AliGenPythiaPlus::GenerateMB()
       if(!okd && iphcand != -1) // execute rotation in phi 
           RotatePhi(iphcand,okd);
       
-      if(!okd)
-	return 0;
+      if(!okd) {
+	  delete[] pParent;
+	  return 0;
+      }
     }
     
     if (fTriggerParticle) {
@@ -1000,7 +1004,7 @@ Int_t  AliGenPythiaPlus::GenerateMB()
 	    origin[1] = fVertex[1]+iparticle->Vy()/10; // [cm]
 	    origin[2] = fVertex[2]+iparticle->Vz()/10; // [cm]
 	    
-	    Float_t tof = fEventTime + kconv * iparticle->T();
+	    Float_t tof = fTime + fEventTime + kconv * iparticle->T();
 
 	    PushTrack(fTrackIt*trackIt, iparent, kf, 
 		      p[0], p[1], p[2], p[3], 
@@ -1099,7 +1103,7 @@ void AliGenPythiaPlus::MakeHeader()
 //
 // Event Vertex 
     fHeader->SetPrimaryVertex(fVertex);
-    
+    fHeader->SetInteractionTime(fTime+fEventTime);    
 //
 // Number of primaries
     fHeader->SetNProduced(fNprimaries);
@@ -1168,7 +1172,7 @@ void AliGenPythiaPlus::MakeHeader()
     fHeader = 0x0;
 }
 
-Bool_t AliGenPythiaPlus::CheckTrigger(TParticle* jet1, TParticle* jet2)
+Bool_t AliGenPythiaPlus::CheckTrigger(const TParticle* jet1, const TParticle* jet2)
 {
 // Check the kinematic trigger condition
 //
@@ -1337,7 +1341,7 @@ void AliGenPythiaPlus::GetSubEventTime()
 
 
 
-Bool_t AliGenPythiaPlus::IsInEMCAL(Float_t phi, Float_t eta)
+Bool_t AliGenPythiaPlus::IsInEMCAL(Float_t phi, Float_t eta) const
 {
   // Is particle in EMCAL acceptance? 
   // phi in degrees, etamin=-etamax
@@ -1348,7 +1352,7 @@ Bool_t AliGenPythiaPlus::IsInEMCAL(Float_t phi, Float_t eta)
     return kFALSE;
 }
 
-Bool_t AliGenPythiaPlus::IsInPHOS(Float_t phi, Float_t eta)
+Bool_t AliGenPythiaPlus::IsInPHOS(Float_t phi, Float_t eta) const
 {
   // Is particle in PHOS acceptance? 
   // Acceptance slightly larger considered.