Don;t store color flow for is = 3,13,14 (nor needed and leads to problems with pyquen)
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Oct 2008 10:43:36 +0000 (10:43 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 16 Oct 2008 10:43:36 +0000 (10:43 +0000)
PYTHIA6/AliGenPythia.cxx

index e8fc9937087450e618f4d5bdeb350f43f91843ec..039f64c067324ce91d4afe9289ef830071119038 100644 (file)
@@ -579,8 +579,6 @@ void AliGenPythia::Generate()
 //     printf("Calling hadronisation %d\n", fPythia->GetN());
            fPythia->Pyexec();  
        }
-       
-               
        fTrials++;
        fPythia->ImportParticles(&fParticles,"All");
        Boost();
@@ -862,7 +860,7 @@ Int_t  AliGenPythia::GenerateMB()
 
       Int_t pdg  = 0; 
       if (fFragPhotonInCalo) pdg = 22   ; // Photon
-      else if (fPi0InCalo) pdg = 111 ; // Pi0
+      else if (fPi0InCalo) pdg = 111 ;    // Pi0
 
       for (i=0; i< np; i++) {
        TParticle* iparticle = (TParticle *) fParticles.At(i);
@@ -871,10 +869,10 @@ Int_t  AliGenPythia::GenerateMB()
          Int_t imother = iparticle->GetFirstMother() - 1;
          TParticle* pmother = (TParticle *) fParticles.At(imother);
          if(pdg == 111 || 
-            (pdg == 22 && pmother->GetStatusCode() != 11))//No photon from hadron decay
+            (pdg == 22 && pmother->GetStatusCode() != 11)) //No photon from hadron decay
            {
              Float_t phi = iparticle->Phi()*180./TMath::Pi(); //Convert to degrees
-             Float_t eta =TMath::Abs(iparticle->Eta());//in calos etamin=-etamax         
+             Float_t eta =TMath::Abs(iparticle->Eta()); //in calos etamin=-etamax        
              if((fCheckEMCAL && IsInEMCAL(phi,eta)) ||
                 (fCheckPHOS    && IsInPHOS(phi,eta)) )
                ok =kTRUE;
@@ -1043,20 +1041,6 @@ Int_t  AliGenPythia::GenerateMB()
                      polar[0], polar[1], polar[2],
                      kPPrimary, nt, 1., ks);
            fNprimaries++;
-           //
-           // Special Treatment to store color-flow
-           //
-           if (ks == 3 || ks == 13 || ks == 14) {
-               TParticle* particle = 0;
-               if (fStack) {
-                   particle = fStack->Particle(nt);
-               } else {
-                   particle = gAlice->Stack()->Particle(nt);
-               }
-               particle->SetFirstDaughter(fPythia->GetK(2, i));
-               particle->SetLastDaughter(fPythia->GetK(3, i));         
-           }
-           
            KeepTrack(nt);
            pParent[i] = nt;
            SetHighWaterMark(nt);