X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PYTHIA6%2FAliGenPythiaPlus.cxx;h=8b3b77fb8a7fa5f014ad010d2a4e87ba4f61fc37;hb=39c2e17092679807bf1e7376b7fdad08b671e99c;hp=aacab3e5c09b04a5aa5901cc17bd024166b7b093;hpb=c2fc9d31a771b6b1dec9911438f699c38d4c231d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx
index aacab3e5c09..8b3b77fb8a7 100644
--- a/PYTHIA6/AliGenPythiaPlus.cxx
+++ b/PYTHIA6/AliGenPythiaPlus.cxx
@@ -124,8 +124,8 @@ AliGenPythiaPlus::AliGenPythiaPlus():
     fPHOSEta(0.13),
     fEMCALMinPhi(79.),
     fEMCALMaxPhi(191.),
-    fEMCALEta(0.71)
-
+    fEMCALEta(0.71),
+    fItune(-1) 
 {
 // Default Constructor
   fEnergyCMS = 5500.;
@@ -211,7 +211,8 @@ AliGenPythiaPlus::AliGenPythiaPlus(AliPythiaBase* pythia)
      fPHOSEta(0.13),
      fEMCALMinPhi(79.),
      fEMCALMaxPhi(191.),
-     fEMCALEta(0.71)
+     fEMCALEta(0.71),
+     fItune(-1) 
 {
 // default charm production at 5. 5 TeV
 // semimuonic decay
@@ -345,7 +346,7 @@ void AliGenPythiaPlus::Init()
 	fRL = 0x0;
     }
  //
-    fPythia->ProcInit(fProcess, fEnergyCMS, fStrucFunc);
+    fPythia->ProcInit(fProcess, fEnergyCMS, fStrucFunc, fItune);
     //  Forward Paramters to the AliPythia object
     fDecayer->SetForceDecay(fForceDecay);    
 // Switch off Heavy Flavors on request  
@@ -443,6 +444,9 @@ void AliGenPythiaPlus::Init()
 	break;
     case kPyW:
     case kPyZ:
+    case kPyMBRSingleDiffraction:
+    case kPyMBRDoubleDiffraction:
+    case kPyMBRCentralDiffraction:
         break;
     }
 //
@@ -497,9 +501,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 +752,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;
  
@@ -1004,7 +1008,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], 
@@ -1103,7 +1107,7 @@ void AliGenPythiaPlus::MakeHeader()
 //
 // Event Vertex 
     fHeader->SetPrimaryVertex(fVertex);
-    
+    fHeader->SetInteractionTime(fTime+fEventTime);    
 //
 // Number of primaries
     fHeader->SetNProduced(fNprimaries);