Coverity fix.

[u/mrichter/AliRoot.git] / PYTHIA6 / AliGenPythia.cxx

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index bb86ff905ba3462f3dee5983277ce52d6f653532..619fe7e20b5f409db731ab050efd461d379ca53a 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -76,6 +76,7 @@ AliGenPythia::AliGenPythia():
     fGinit(1),
     fGfinal(1),
     fHadronisation(1),
+    fPatchOmegaDalitz(0), 
     fNpartons(0),
     fReadFromFile(0),
     fQuench(0),
@@ -120,7 +121,7 @@ AliGenPythia::AliGenPythia():
     fCountMode(kCountAll),      
     fHeader(0),  
     fRL(0),      
-    fFileName(0),
+    fkFileName(0),
     fFragPhotonInCalo(kFALSE),
     fPi0InCalo(kFALSE) ,
     fPhotonInCalo(kFALSE),
@@ -172,6 +173,7 @@ AliGenPythia::AliGenPythia(Int_t npart)
      fGinit(kTRUE),
      fGfinal(kTRUE),
      fHadronisation(kTRUE),
+     fPatchOmegaDalitz(0), 
      fNpartons(0),
      fReadFromFile(kFALSE),
      fQuench(kFALSE),
@@ -216,7 +218,7 @@ AliGenPythia::AliGenPythia(Int_t npart)
      fCountMode(kCountAll),      
      fHeader(0),  
      fRL(0),      
-     fFileName(0),
+     fkFileName(0),
      fFragPhotonInCalo(kFALSE),
      fPi0InCalo(kFALSE) ,
      fPhotonInCalo(kFALSE),
@@ -368,7 +370,7 @@ void AliGenPythia::Init()
 
 
     if (fReadFromFile) {
-       fRL  =  AliRunLoader::Open(fFileName, "Partons");
+       fRL  =  AliRunLoader::Open(fkFileName, "Partons");
        fRL->LoadKinematics();
        fRL->LoadHeader();
     } else {
@@ -431,6 +433,10 @@ void AliGenPythia::Init()
        fParentSelect[0] =   431;
        fFlavorSelect    =   4; 
        break;
+    case kPyLambdacppMNR:
+       fParentSelect[0] =  4122;
+       fFlavorSelect    =   4; 
+       break;      
     case kPyBeauty:
     case kPyBeautyJets:
     case kPyBeautyPbPbMNR:
@@ -584,6 +590,7 @@ void AliGenPythia::Generate()
            AliFastGlauber::Instance()->GetRandomBHard(bimp);
            fPythia->SetPARJ(197, bimp);
            fImpact = bimp;
+           fPythia->Qpygin0();
        } 
 //
 // Either produce new event or read partons from file
@@ -622,11 +629,21 @@ void AliGenPythia::Generate()
 //
 // .. and perform hadronisation
 //     printf("Calling hadronisation %d\n", fPythia->GetN());
-           fPythia->Pyexec();  
+
+           if (fPatchOmegaDalitz) {
+             fPythia->SetMDCY(fPythia->Pycomp(111) ,1, 0);
+             fPythia->Pyexec();
+             fPythia->DalitzDecays();
+             fPythia->SetMDCY(fPythia->Pycomp(111) ,1, 1);
+           } 
+           fPythia->Pyexec();
        }
        fTrials++;
        fPythia->ImportParticles(&fParticles,"All");
+       
        if (TMath::Abs(fDyBoost) > 1.e-4) Boost();
+       if(TMath::Abs(fXingAngleY) > 1.e-10) BeamCrossAngle();
+       
 //
 //
 //
@@ -1250,8 +1267,10 @@ void AliGenPythia::MakeHeader()
 // Store quenching parameters
 //
     if (fQuench){
-       Double_t z[4];
-       Double_t xp, yp;
+       Double_t z[4] = {0.};
+       Double_t xp = 0.;
+       Double_t yp = 0.;
+       
        if (fQuench == 1) {
            // Pythia::Quench()
            fPythia->GetQuenchingParameters(xp, yp, z);
@@ -1614,8 +1633,8 @@ void AliGenPythia::RotatePhi(Int_t iphcand, Bool_t& okdd)
   //loop for all particles and produce the phi rotation
   Int_t np = (fHadronisation) ? fParticles.GetEntriesFast() : fNpartons;
   Double_t oldphi, newphi;
-  Double_t newVx, newVy, R, Vz, time; 
-  Double_t newPx, newPy, pt, Pz, e;
+  Double_t newVx, newVy, r, vZ, time; 
+  Double_t newPx, newPy, pt, pz, e;
   for(Int_t i=0; i< np; i++) {
       TParticle* iparticle = (TParticle *) fParticles.At(i);
       oldphi = iparticle->Phi();
@@ -1623,21 +1642,21 @@ void AliGenPythia::RotatePhi(Int_t iphcand, Bool_t& okdd)
       if(newphi < 0) newphi = 2*TMath::Pi() + newphi; // correct angle 
       if(newphi > 2*TMath::Pi()) newphi = newphi - 2*TMath::Pi(); // correct angle
       
-      R = iparticle->R();
-      newVx = R*TMath::Cos(newphi);
-      newVy = R*TMath::Sin(newphi);
-      Vz = iparticle->Vz(); // don't transform
+      r = iparticle->R();
+      newVx = r * TMath::Cos(newphi);
+      newVy = r * TMath::Sin(newphi);
+      vZ   = iparticle->Vz(); // don't transform
       time = iparticle->T(); // don't transform
       
       pt = iparticle->Pt();
-      newPx = pt*TMath::Cos(newphi);
-      newPy = pt*TMath::Sin(newphi);
-      Pz = iparticle->Pz(); // don't transform
-      e = iparticle->Energy(); // don't transform
+      newPx = pt * TMath::Cos(newphi);
+      newPy = pt * TMath::Sin(newphi);
+      pz = iparticle->Pz(); // don't transform
+      e  = iparticle->Energy(); // don't transform
       
       // apply rotation 
-      iparticle->SetProductionVertex(newVx, newVy, Vz, time);
-      iparticle->SetMomentum(newPx, newPy, Pz, e);
+      iparticle->SetProductionVertex(newVx, newVy, vZ, time);
+      iparticle->SetMomentum(newPx, newPy, pz, e);
       
   } //end particle loop 
   
@@ -1649,46 +1668,4 @@ void AliGenPythia::RotatePhi(Int_t iphcand, Bool_t& okdd)
 }
 
 
-#ifdef never
-void AliGenPythia::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliGenPythia.
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      AliGenerator::Streamer(R__b);
-      R__b >> (Int_t&)fProcess;
-      R__b >> (Int_t&)fStrucFunc;
-      R__b >> (Int_t&)fForceDecay;
-      R__b >> fEnergyCMS;
-      R__b >> fKineBias;
-      R__b >> fTrials;
-      fParentSelect.Streamer(R__b);
-      fChildSelect.Streamer(R__b);
-      R__b >> fXsection;
-//      (AliPythia::Instance())->Streamer(R__b);
-      R__b >> fPtHardMin;
-      R__b >> fPtHardMax;
-//      if (fDecayer) fDecayer->Streamer(R__b);
-   } else {
-      R__b.WriteVersion(AliGenPythia::IsA());
-      AliGenerator::Streamer(R__b);
-      R__b << (Int_t)fProcess;
-      R__b << (Int_t)fStrucFunc;
-      R__b << (Int_t)fForceDecay;
-      R__b << fEnergyCMS;
-      R__b << fKineBias;
-      R__b << fTrials;
-      fParentSelect.Streamer(R__b);
-      fChildSelect.Streamer(R__b);
-      R__b << fXsection;
-//      R__b << fPythia;
-      R__b << fPtHardMin;
-      R__b << fPtHardMax;
-      //     fDecayer->Streamer(R__b);
-   }
-}
-#endif
-
-