X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=PYTHIA6%2FAliGenPythia.cxx;h=b3dae11cf44769faddcccc78f870f737a68959c7;hp=c73145bbc05de3308010f2b7e10fb1f6d245d1eb;hb=6d2ec66de30e8ab635800ae82faf0c6336dd0065;hpb=2779fc6427378c596c6df22d7f1a154c5e3642c6 diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx index c73145bbc05..b3dae11cf44 100644 --- a/PYTHIA6/AliGenPythia.cxx +++ b/PYTHIA6/AliGenPythia.cxx @@ -25,15 +25,17 @@ // andreas.morsch@cern.ch // +#include #include #include #include +#include #include #include - #include "AliConst.h" #include "AliDecayerPythia.h" #include "AliGenPythia.h" +#include "AliFastGlauber.h" #include "AliHeader.h" #include "AliGenPythiaEventHeader.h" #include "AliPythia.h" @@ -42,89 +44,263 @@ #include "AliStack.h" #include "AliRunLoader.h" #include "AliMC.h" +#include "PyquenCommon.h" ClassImp(AliGenPythia) -AliGenPythia::AliGenPythia() - :AliGenMC() + +AliGenPythia::AliGenPythia(): + AliGenMC(), + fProcess(kPyCharm), + fItune(-1), + fStrucFunc(kCTEQ5L), + fKineBias(0.), + fTrials(0), + fTrialsRun(0), + fQ(0.), + fX1(0.), + fX2(0.), + fEventTime(0.), + fInteractionRate(0.), + fTimeWindow(0.), + fCurSubEvent(0), + fEventsTime(0), + fNev(0), + fFlavorSelect(0), + fXsection(0.), + fPythia(0), + fPtHardMin(0.), + fPtHardMax(1.e4), + fYHardMin(-1.e10), + fYHardMax(1.e10), + fGinit(1), + fGfinal(1), + fHadronisation(1), + fNpartons(0), + fReadFromFile(0), + fQuench(0), + fQhat(0.), + fLength(0.), + fImpact(0.), + fPtKick(1.), + fFullEvent(kTRUE), + fDecayer(new AliDecayerPythia()), + fDebugEventFirst(-1), + fDebugEventLast(-1), + fEtMinJet(0.), + fEtMaxJet(1.e4), + fEtaMinJet(-20.), + fEtaMaxJet(20.), + fPhiMinJet(0.), + fPhiMaxJet(2.* TMath::Pi()), + fJetReconstruction(kCell), + fEtaMinGamma(-20.), + fEtaMaxGamma(20.), + fPhiMinGamma(0.), + fPhiMaxGamma(2. * TMath::Pi()), + fPycellEtaMax(2.), + fPycellNEta(274), + fPycellNPhi(432), + fPycellThreshold(0.), + fPycellEtSeed(4.), + fPycellMinEtJet(10.), + fPycellMaxRadius(1.), + fStackFillOpt(kFlavorSelection), + fFeedDownOpt(kTRUE), + fFragmentation(kTRUE), + fSetNuclei(kFALSE), + fNewMIS(kFALSE), + fHFoff(kFALSE), + fNucPdf(0), + fTriggerParticle(0), + fTriggerEta(0.9), + fTriggerMultiplicity(0), + fTriggerMultiplicityEta(0), + fTriggerMultiplicityPtMin(0), + fCountMode(kCountAll), + fHeader(0), + fRL(0), + fFileName(0), + fFragPhotonInCalo(kFALSE), + fPi0InCalo(kFALSE) , + fPhotonInCalo(kFALSE), + fEleInEMCAL(kFALSE), + fCheckEMCAL(kFALSE), + fCheckPHOS(kFALSE), + fCheckPHOSeta(kFALSE), + fFragPhotonOrPi0MinPt(0), + fPhotonMinPt(0), + fElectronMinPt(0), + fPHOSMinPhi(219.), + fPHOSMaxPhi(321.), + fPHOSEta(0.13), + fEMCALMinPhi(79.), + fEMCALMaxPhi(191.), + fEMCALEta(0.71) + { // Default Constructor - fParticles = 0; - fPythia = 0; - fHeader = 0; - fReadFromFile = 0; - fDecayer = new AliDecayerPythia(); - SetEventListRange(); - SetJetPhiRange(); - SetJetEtaRange(); - SetJetEtRange(); - SetGammaPhiRange(); - SetGammaEtaRange(); - SetPtKick(); - SetQuench(); - SetHadronisation(); - fSetNuclei = kFALSE; + fEnergyCMS = 5500.; if (!AliPythiaRndm::GetPythiaRandom()) - AliPythiaRndm::SetPythiaRandom(GetRandom()); + AliPythiaRndm::SetPythiaRandom(GetRandom()); } AliGenPythia::AliGenPythia(Int_t npart) - :AliGenMC(npart) + :AliGenMC(npart), + fProcess(kPyCharm), + fItune(-1), + fStrucFunc(kCTEQ5L), + fKineBias(0.), + fTrials(0), + fTrialsRun(0), + fQ(0.), + fX1(0.), + fX2(0.), + fEventTime(0.), + fInteractionRate(0.), + fTimeWindow(0.), + fCurSubEvent(0), + fEventsTime(0), + fNev(0), + fFlavorSelect(0), + fXsection(0.), + fPythia(0), + fPtHardMin(0.), + fPtHardMax(1.e4), + fYHardMin(-1.e10), + fYHardMax(1.e10), + fGinit(kTRUE), + fGfinal(kTRUE), + fHadronisation(kTRUE), + fNpartons(0), + fReadFromFile(kFALSE), + fQuench(kFALSE), + fQhat(0.), + fLength(0.), + fImpact(0.), + fPtKick(1.), + fFullEvent(kTRUE), + fDecayer(new AliDecayerPythia()), + fDebugEventFirst(-1), + fDebugEventLast(-1), + fEtMinJet(0.), + fEtMaxJet(1.e4), + fEtaMinJet(-20.), + fEtaMaxJet(20.), + fPhiMinJet(0.), + fPhiMaxJet(2.* TMath::Pi()), + fJetReconstruction(kCell), + fEtaMinGamma(-20.), + fEtaMaxGamma(20.), + fPhiMinGamma(0.), + fPhiMaxGamma(2. * TMath::Pi()), + fPycellEtaMax(2.), + fPycellNEta(274), + fPycellNPhi(432), + fPycellThreshold(0.), + fPycellEtSeed(4.), + fPycellMinEtJet(10.), + fPycellMaxRadius(1.), + fStackFillOpt(kFlavorSelection), + fFeedDownOpt(kTRUE), + fFragmentation(kTRUE), + fSetNuclei(kFALSE), + fNewMIS(kFALSE), + fHFoff(kFALSE), + fNucPdf(0), + fTriggerParticle(0), + fTriggerEta(0.9), + fTriggerMultiplicity(0), + fTriggerMultiplicityEta(0), + fTriggerMultiplicityPtMin(0), + fCountMode(kCountAll), + fHeader(0), + fRL(0), + fFileName(0), + fFragPhotonInCalo(kFALSE), + fPi0InCalo(kFALSE) , + fPhotonInCalo(kFALSE), + fEleInEMCAL(kFALSE), + fCheckEMCAL(kFALSE), + fCheckPHOS(kFALSE), + fCheckPHOSeta(kFALSE), + fFragPhotonOrPi0MinPt(0), + fPhotonMinPt(0), + fElectronMinPt(0), + fPHOSMinPhi(219.), + fPHOSMaxPhi(321.), + fPHOSEta(0.13), + fEMCALMinPhi(79.), + fEMCALMaxPhi(191.), + fEMCALEta(0.71) { // default charm production at 5. 5 TeV // semimuonic decay // structure function GRVHO // + fEnergyCMS = 5500.; fName = "Pythia"; fTitle= "Particle Generator using PYTHIA"; - fXsection = 0.; - fReadFromFile = 0; - SetProcess(); - SetStrucFunc(); SetForceDecay(); - SetPtHard(); - SetYHard(); - SetEnergyCMS(); - fDecayer = new AliDecayerPythia(); // Set random number generator if (!AliPythiaRndm::GetPythiaRandom()) AliPythiaRndm::SetPythiaRandom(GetRandom()); - fFlavorSelect = 0; - // Produced particles - fParticles = new TClonesArray("TParticle",1000); - fHeader = 0; - SetEventListRange(); - SetJetPhiRange(); - SetJetEtaRange(); - SetJetEtRange(); - SetGammaPhiRange(); - SetGammaEtaRange(); - SetJetReconstructionMode(); - SetQuench(); - SetHadronisation(); - SetPtKick(); - // Options determining what to keep in the stack (Heavy flavour generation) - fStackFillOpt = kFlavorSelection; // Keep particle with selected flavor - fFeedDownOpt = kTRUE; // allow feed down from higher family - // Fragmentation on/off - fFragmentation = kTRUE; - // Default counting mode - fCountMode = kCountAll; - // Pycel - SetPycellParameters(); - fSetNuclei = kFALSE; + } + +AliGenPythia::~AliGenPythia() +{ +// Destructor + if(fEventsTime) delete fEventsTime; } -AliGenPythia::AliGenPythia(const AliGenPythia & Pythia) - :AliGenMC(Pythia) +void AliGenPythia::SetInteractionRate(Float_t rate,Float_t timewindow) { -// copy constructor - Pythia.Copy(*this); +// Generate pileup using user specified rate + fInteractionRate = rate; + fTimeWindow = timewindow; + GeneratePileup(); } -AliGenPythia::~AliGenPythia() +void AliGenPythia::GeneratePileup() { -// Destructor +// Generate sub events time for pileup + fEventsTime = 0; + if(fInteractionRate == 0.) { + Warning("GeneratePileup","Zero interaction specified. Skipping pileup generation.\n"); + return; + } + + Int_t npart = NumberParticles(); + if(npart < 0) { + Warning("GeneratePileup","Negative number of particles. Skipping pileup generation.\n"); + return; + } + + if(fEventsTime) delete fEventsTime; + fEventsTime = new TArrayF(npart); + TArrayF &array = *fEventsTime; + for(Int_t ipart = 0; ipart < npart; ipart++) + array[ipart] = 0.; + + Float_t eventtime = 0.; + while(1) + { + eventtime += (AliPythiaRndm::GetPythiaRandom())->Exp(1./fInteractionRate); + if(eventtime > fTimeWindow) break; + array.Set(array.GetSize()+1); + array[array.GetSize()-1] = eventtime; + } + + eventtime = 0.; + while(1) + { + eventtime -= (AliPythiaRndm::GetPythiaRandom())->Exp(1./fInteractionRate); + if(TMath::Abs(eventtime) > fTimeWindow) break; + array.Set(array.GetSize()+1); + array[array.GetSize()-1] = eventtime; + } + + SetNumberParticles(fEventsTime->GetSize()); } void AliGenPythia::SetPycellParameters(Float_t etamax, Int_t neta, Int_t nphi, @@ -161,9 +337,6 @@ void AliGenPythia::Init() // fParentWeight=1./Float_t(fNpart); // -// Forward Paramters to the AliPythia object - fDecayer->SetForceDecay(fForceDecay); - fDecayer->Init(); fPythia->SetCKIN(3,fPtHardMin); @@ -171,7 +344,7 @@ void AliGenPythia::Init() fPythia->SetCKIN(7,fYHardMin); fPythia->SetCKIN(8,fYHardMax); - if (fAProjectile > 0 && fATarget > 0) fPythia->SetNuclei(fAProjectile, fATarget); + if (fAProjectile > 0 && fATarget > 0) fPythia->SetNuclei(fAProjectile, fATarget, fNucPdf); // Fragmentation? if (fFragmentation) { fPythia->SetMSTP(111,1); @@ -187,7 +360,8 @@ void AliGenPythia::Init() // pt - kick if (fPtKick > 0.) { fPythia->SetMSTP(91,1); - fPythia->SetPARP(91,fPtKick); + fPythia->SetPARP(91,fPtKick); + fPythia->SetPARP(93, 4. * fPtKick); } else { fPythia->SetMSTP(91,0); } @@ -200,23 +374,43 @@ void AliGenPythia::Init() } else { 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 + if (fHFoff) { + // Maximum number of quark flavours used in pdf + fPythia->SetMSTP(58, 3); + // Maximum number of flavors that can be used in showers + fPythia->SetMSTJ(45, 3); + // Switch off g->QQbar splitting in decay table + ((AliDecayerPythia*) fDecayer)->HeavyFlavourOff(); + } + + fDecayer->Init(); + // Parent and Children Selection switch (fProcess) { + case kPyOldUEQ2ordered: + case kPyOldUEQ2ordered2: + case kPyOldPopcorn: + break; case kPyCharm: case kPyCharmUnforced: case kPyCharmPbPbMNR: - case kPyCharmppMNR: case kPyCharmpPbMNR: + case kPyCharmppMNR: + case kPyCharmppMNRwmi: fParentSelect[0] = 411; fParentSelect[1] = 421; fParentSelect[2] = 431; fParentSelect[3] = 4122; + fParentSelect[4] = 4232; + fParentSelect[5] = 4132; + fParentSelect[6] = 4332; fFlavorSelect = 4; break; case kPyD0PbPbMNR: @@ -231,10 +425,18 @@ void AliGenPythia::Init() fParentSelect[0] = 411; fFlavorSelect = 4; break; + case kPyDPlusStrangePbPbMNR: + case kPyDPlusStrangepPbMNR: + case kPyDPlusStrangeppMNR: + fParentSelect[0] = 431; + fFlavorSelect = 4; + break; case kPyBeauty: + case kPyBeautyJets: case kPyBeautyPbPbMNR: case kPyBeautypPbMNR: case kPyBeautyppMNR: + case kPyBeautyppMNRwmi: fParentSelect[0]= 511; fParentSelect[1]= 521; fParentSelect[2]= 531; @@ -258,11 +460,19 @@ void AliGenPythia::Init() case kPyJpsi: fParentSelect[0] = 443; break; + case kPyMbDefault: + case kPyMbAtlasTuneMC09: case kPyMb: + case kPyMbWithDirectPhoton: case kPyMbNonDiffr: + case kPyMbMSEL1: case kPyJets: case kPyDirectGamma: + case kPyLhwgMb: break; + case kPyW: + case kPyZ: + break; } // // @@ -270,17 +480,17 @@ void AliGenPythia::Init() // // Configure detector (EMCAL like) // - fPythia->SetPARU(51, fPycellEtaMax); - fPythia->SetMSTU(51, fPycellNEta); - fPythia->SetMSTU(52, fPycellNPhi); + fPythia->SetPARU(51, fPycellEtaMax); + fPythia->SetMSTU(51, fPycellNEta); + fPythia->SetMSTU(52, fPycellNPhi); // // Configure Jet Finder // - fPythia->SetPARU(58, fPycellThreshold); - fPythia->SetPARU(52, fPycellEtSeed); - fPythia->SetPARU(53, fPycellMinEtJet); - fPythia->SetPARU(54, fPycellMaxRadius); - fPythia->SetMSTU(54, 2); + fPythia->SetPARU(58, fPycellThreshold); + fPythia->SetPARU(52, fPycellEtSeed); + fPythia->SetPARU(53, fPycellMinEtJet); + fPythia->SetPARU(54, fPycellMaxRadius); + fPythia->SetMSTU(54, 2); // // This counts the total number of calls to Pyevnt() per run. fTrialsRun = 0; @@ -299,17 +509,45 @@ void AliGenPythia::Init() fDyBoost = 0; Warning("Init","SetNuclei used. Use SetProjectile + SetTarget instead. fDyBoost has been reset to 0\n"); } + + fPythia->SetPARJ(200, 0.0); + fPythia->SetPARJ(199, 0.0); + fPythia->SetPARJ(198, 0.0); + fPythia->SetPARJ(197, 0.0); - if (fQuench) { + if (fQuench == 1) { fPythia->InitQuenching(0., 0.1, 0.6e6, 0); } - + + if (fQuench == 3) { + // Nestor's change of the splittings + fPythia->SetPARJ(200, 0.8); + fPythia->SetMSTJ(41, 1); // QCD radiation only + fPythia->SetMSTJ(42, 2); // angular ordering + fPythia->SetMSTJ(44, 2); // option to run alpha_s + fPythia->SetMSTJ(47, 0); // No correction back to hard scattering element + fPythia->SetMSTJ(50, 0); // No coherence in first branching + fPythia->SetPARJ(82, 1.); // Cut off for parton showers + } else if (fQuench == 4) { + // Armesto-Cunqueiro-Salgado change of the splittings. + AliFastGlauber* glauber = AliFastGlauber::Instance(); + glauber->Init(2); + //read and store transverse almonds corresponding to differnt + //impact parameters. + glauber->SetCentralityClass(0.,0.1); + fPythia->SetPARJ(200, 1.); + fPythia->SetPARJ(198, fQhat); + fPythia->SetPARJ(199, fLength); + fPythia->SetMSTJ(42, 2); // angular ordering + fPythia->SetMSTJ(44, 2); // option to run alpha_s + fPythia->SetPARJ(82, 1.); // Cut off for parton showers + } } void AliGenPythia::Generate() { // Generate one event - + if (!fPythia) fPythia=(AliPythia*) fMCEvGen; fDecayer->ForceDecay(); Float_t polar[3] = {0,0,0}; @@ -322,6 +560,8 @@ void AliGenPythia::Generate() Int_t jev=0; Int_t j, kf; fTrials=0; + fEventTime = 0.; + // Set collision vertex position @@ -337,15 +577,27 @@ void AliGenPythia::Generate() // Switch hadronisation off // fPythia->SetMSTJ(1, 0); + + if (fQuench ==4){ + Double_t bimp; + // Quenching comes through medium-modified splitting functions. + AliFastGlauber::Instance()->GetRandomBHard(bimp); + fPythia->SetPARJ(197, bimp); + fImpact = bimp; + } // // Either produce new event or read partons from file // if (!fReadFromFile) { - fPythia->Pyevnt(); + if (!fNewMIS) { + fPythia->Pyevnt(); + } else { + fPythia->Pyevnw(); + } fNpartons = fPythia->GetN(); } else { - printf("Loading Event %d\n",AliRunLoader::GetRunLoader()->GetEventNumber()); - fRL->GetEvent(AliRunLoader::GetRunLoader()->GetEventNumber()); + printf("Loading Event %d\n",AliRunLoader::Instance()->GetEventNumber()); + fRL->GetEvent(AliRunLoader::Instance()->GetEventNumber()); fPythia->SetN(0); LoadEvent(fRL->Stack(), 0 , 1); fPythia->Pyedit(21); @@ -358,33 +610,32 @@ void AliGenPythia::Generate() fPythia->Quench(); } else if (fQuench == 2){ fPythia->Pyquen(208., 0, 0.); + } else if (fQuench == 3) { + // Quenching is via multiplicative correction of the splittings } + // // Switch hadronisation on // - fPythia->SetMSTJ(1, 1); + if (fHadronisation) { + fPythia->SetMSTJ(1, 1); // // .. and perform hadronisation // printf("Calling hadronisation %d\n", fPythia->GetN()); - fPythia->Pyexec(); - - if (gAlice) { - if (gAlice->GetEvNumber()>=fDebugEventFirst && - gAlice->GetEvNumber()<=fDebugEventLast) fPythia->Pylist(1); + fPythia->Pyexec(); } - fTrials++; - fPythia->ImportParticles(fParticles,"All"); - Boost(); + fPythia->ImportParticles(&fParticles,"All"); + if (TMath::Abs(fDyBoost) > 1.e-4) Boost(); // // // Int_t i; - - Int_t np = fParticles->GetEntriesFast(); + fNprimaries = 0; + Int_t np = fParticles.GetEntriesFast(); - if (np == 0 ) continue; + if (np == 0) continue; // // @@ -400,12 +651,22 @@ void AliGenPythia::Generate() Int_t nc = 0; // Total n. of selected particles Int_t nParents = 0; // Selected parents Int_t nTkbles = 0; // Trackable particles - if (fProcess != kPyMb && fProcess != kPyJets && + if (fProcess != kPyMbDefault && + fProcess != kPyMb && + fProcess != kPyMbAtlasTuneMC09 && + fProcess != kPyMbWithDirectPhoton && + fProcess != kPyJets && fProcess != kPyDirectGamma && - fProcess != kPyMbNonDiffr) { + fProcess != kPyMbNonDiffr && + fProcess != kPyMbMSEL1 && + fProcess != kPyW && + fProcess != kPyZ && + fProcess != kPyCharmppMNRwmi && + fProcess != kPyBeautyppMNRwmi && + fProcess != kPyBeautyJets) { for (i = 0; i < np; i++) { - TParticle* iparticle = (TParticle *) fParticles->At(i); + TParticle* iparticle = (TParticle *) fParticles.At(i); Int_t ks = iparticle->GetStatusCode(); kf = CheckPDGCode(iparticle->GetPdgCode()); // No initial state partons @@ -416,19 +677,39 @@ void AliGenPythia::Generate() // quark ? kf = TMath::Abs(kf); Int_t kfl = kf; + // Resonance + + if (kfl > 100000) kfl %= 100000; + if (kfl > 10000) kfl %= 10000; // meson ? if (kfl > 10) kfl/=100; // baryon if (kfl > 10) kfl/=10; - if (kfl > 10) kfl/=10; - Int_t ipa = iparticle->GetFirstMother()-1; Int_t kfMo = 0; +// +// Establish mother daughter relation between heavy quarks and mesons +// + if (kf >= fFlavorSelect && kf <= 6) { + Int_t idau = iparticle->GetFirstDaughter() - 1; + if (idau > -1) { + TParticle* daughter = (TParticle *) fParticles.At(idau); + Int_t pdgD = daughter->GetPdgCode(); + if (pdgD == 91 || pdgD == 92) { + Int_t jmin = daughter->GetFirstDaughter() - 1; + Int_t jmax = daughter->GetLastDaughter() - 1; + for (Int_t jp = jmin; jp <= jmax; jp++) + ((TParticle *) fParticles.At(jp))->SetFirstMother(i+1); + } // is string or cluster + } // has daughter + } // heavy quark + if (ipa > -1) { - TParticle * mother = (TParticle *) fParticles->At(ipa); + TParticle * mother = (TParticle *) fParticles.At(ipa); kfMo = TMath::Abs(mother->GetPdgCode()); } + // What to keep in Stack? Bool_t flavorOK = kFALSE; Bool_t selectOK = kFALSE; @@ -456,7 +737,7 @@ void AliGenPythia::Generate() // Kinematic seletion on final state heavy flavor mesons if (ParentSelected(kf) && !KinematicSelection(iparticle, 0)) { - continue; + continue; } pSelected[i] = 1; if (ParentSelected(kf)) ++nParents; // Update parent count @@ -464,9 +745,9 @@ void AliGenPythia::Generate() } else { // Kinematic seletion on decay products if (fCutOnChild && ParentSelected(kfMo) && ChildSelected(kf) - && !KinematicSelection(iparticle, 1)) + && !KinematicSelection(iparticle, 1)) { - continue; + continue; } // // Decay products @@ -496,6 +777,7 @@ void AliGenPythia::Generate() if (!pSelected[i]) continue; // Count quarks only if you did not include fragmentation if (fFragmentation && kf <= 10) continue; + nc++; // Decision on tracking trackIt[i] = 0; @@ -518,7 +800,7 @@ void AliGenPythia::Generate() if (nc > 0) { for (i = 0; iAt(i); + TParticle * iparticle = (TParticle *) fParticles.At(i); kf = CheckPDGCode(iparticle->GetPdgCode()); Int_t ks = iparticle->GetStatusCode(); p[0] = iparticle->Px(); @@ -540,16 +822,19 @@ void AliGenPythia::Generate() polar[0], polar[1], polar[2], kPPrimary, nt, 1., ks); pParent[i] = nt; - KeepTrack(nt); + KeepTrack(nt); + fNprimaries++; } // PushTrack loop } } else { nc = GenerateMB(); } // mb ? + + GetSubEventTime(); - if (pParent) delete[] pParent; - if (pSelected) delete[] pSelected; - if (trackIt) delete[] trackIt; + delete[] pParent; + delete[] pSelected; + delete[] trackIt; if (nc > 0) { switch (fCountMode) { @@ -568,8 +853,7 @@ void AliGenPythia::Generate() } if (jev >= fNpart || fNpart == -1) { fKineBias=Float_t(fNpart)/Float_t(fTrials); - printf("\n Trials: %i %i %i\n",fTrials, fNpart, jev); - + fQ += fPythia->GetVINT(51); fX1 += fPythia->GetVINT(41); fX2 += fPythia->GetVINT(42); @@ -602,26 +886,229 @@ Int_t AliGenPythia::GenerateMB() - Int_t np = (fHadronisation) ? fParticles->GetEntriesFast() : fNpartons; + Int_t np = (fHadronisation) ? fParticles.GetEntriesFast() : fNpartons; + Int_t* pParent = new Int_t[np]; for (i=0; i< np; i++) pParent[i] = -1; - if (fProcess == kPyJets || fProcess == kPyDirectGamma) { - TParticle* jet1 = (TParticle *) fParticles->At(6); - TParticle* jet2 = (TParticle *) fParticles->At(7); - if (!CheckTrigger(jet1, jet2)) return 0; + if (fProcess == kPyJets || fProcess == kPyDirectGamma || fProcess == kPyBeautyJets || fProcess == kPyBeautyppMNRwmi) { + TParticle* jet1 = (TParticle *) fParticles.At(6); + TParticle* jet2 = (TParticle *) fParticles.At(7); + if (!CheckTrigger(jet1, jet2)) { + delete [] pParent; + return 0; + } } + + // Select jets with fragmentation photon or pi0 going to PHOS or EMCAL + if (fProcess == kPyJets && (fFragPhotonInCalo || fPi0InCalo) ) { + + Bool_t ok = kFALSE; + + Int_t pdg = 0; + if (fFragPhotonInCalo) pdg = 22 ; // Photon + else if (fPi0InCalo) pdg = 111 ; // Pi0 + + for (i=0; i< np; i++) { + TParticle* iparticle = (TParticle *) fParticles.At(i); + if(iparticle->GetStatusCode()==1 && iparticle->GetPdgCode()==pdg && + iparticle->Pt() > fFragPhotonOrPi0MinPt){ + 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 + { + Float_t phi = iparticle->Phi()*180./TMath::Pi(); //Convert to degrees + Float_t eta =TMath::Abs(iparticle->Eta()); //in calos etamin=-etamax + if((fCheckEMCAL && IsInEMCAL(phi,eta)) || + (fCheckPHOS && IsInPHOS(phi,eta)) ) + ok =kTRUE; + } + } + } + if(!ok) + return 0; + } + + // Select beauty jets with electron in EMCAL + if (fProcess == kPyBeautyJets && fEleInEMCAL) { + + Bool_t ok = kFALSE; + + Int_t pdg = 11; //electron + + Float_t pt = 0.; + Float_t eta = 0.; + Float_t phi = 0.; + for (i=0; i< np; i++) { + TParticle* iparticle = (TParticle *) fParticles.At(i); + if(iparticle->GetStatusCode()==1 && TMath::Abs(iparticle->GetPdgCode())==pdg && + iparticle->Pt() > fElectronMinPt){ + pt = iparticle->Pt(); + phi = iparticle->Phi()*180./TMath::Pi(); //Convert to degrees + eta =TMath::Abs(iparticle->Eta()); //in calos etamin=-etamax + if(IsInEMCAL(phi,eta)) + ok =kTRUE; + } + } + if(!ok) + return 0; + AliDebug(5,Form("Found an electron jet (pt,eta,phi) = (%f,%f,%f)",pt,eta,phi)); + } + // Check for minimum multiplicity + if (fTriggerMultiplicity > 0) { + Int_t multiplicity = 0; + for (i = 0; i < np; i++) { + TParticle * iparticle = (TParticle *) fParticles.At(i); + + Int_t statusCode = iparticle->GetStatusCode(); + + // Initial state particle + if (statusCode != 1) + continue; + // eta cut + if (fTriggerMultiplicityEta > 0 && TMath::Abs(iparticle->Eta()) > fTriggerMultiplicityEta) + continue; + // pt cut + if (iparticle->Pt() < fTriggerMultiplicityPtMin) + continue; + + TParticlePDG* pdgPart = iparticle->GetPDG(); + if (pdgPart && pdgPart->Charge() == 0) + continue; + + ++multiplicity; + } + + if (multiplicity < fTriggerMultiplicity) { + delete [] pParent; + return 0; + } + Printf("Triggered on event with multiplicity of %d >= %d", multiplicity, fTriggerMultiplicity); + } - for (i = 0; i min pt going to PHOS eta acceptance or exactly PHOS eta phi + if ((fProcess == kPyJets || fProcess == kPyDirectGamma) && fPhotonInCalo && (fCheckPHOSeta || fCheckPHOS)){ + + Bool_t okd = kFALSE; + + Int_t pdg = 22; + Int_t iphcand = -1; + for (i=0; i< np; i++) { + TParticle* iparticle = (TParticle *) fParticles.At(i); + Float_t phi = iparticle->Phi()*180./TMath::Pi(); //Convert to degrees + Float_t eta =TMath::Abs(iparticle->Eta());//in calos etamin=-etamax + + if(iparticle->GetStatusCode() == 1 + && iparticle->GetPdgCode() == pdg + && iparticle->Pt() > fPhotonMinPt + && eta < fPHOSEta){ + + // first check if the photon is in PHOS phi + if(IsInPHOS(phi,eta)){ + okd = kTRUE; + break; + } + if(fCheckPHOSeta) iphcand = i; // candiate photon to rotate in phi + + } + } + + if(!okd && iphcand != -1) // execute rotation in phi + RotatePhi(iphcand,okd); + + if(!okd) + return 0; + } + + if (fTriggerParticle) { + Bool_t triggered = kFALSE; + for (i = 0; i < np; i++) { + TParticle * iparticle = (TParticle *) fParticles.At(i); + kf = CheckPDGCode(iparticle->GetPdgCode()); + if (kf != fTriggerParticle) continue; + if (iparticle->Pt() == 0.) continue; + if (TMath::Abs(iparticle->Eta()) > fTriggerEta) continue; + triggered = kTRUE; + break; + } + if (!triggered) { + delete [] pParent; + return 0; + } + } + + + // Check if there is a ccbar or bbbar pair with at least one of the two + // in fYMin < y < fYMax + + if (fProcess == kPyCharmppMNRwmi || fProcess == kPyBeautyppMNRwmi || fProcess == kPyBeautyJets) { + TParticle *partCheck; + TParticle *mother; + Bool_t theQ=kFALSE,theQbar=kFALSE,inYcut=kFALSE; + Bool_t theChild=kFALSE; + Float_t y; + Int_t pdg,mpdg,mpdgUpperFamily; + for(i=0; iGetPdgCode(); + if(TMath::Abs(pdg) == fFlavorSelect) { // quark + if(pdg>0) { theQ=kTRUE; } else { theQbar=kTRUE; } + y = 0.5*TMath::Log((partCheck->Energy()+partCheck->Pz()+1.e-13)/ + (partCheck->Energy()-partCheck->Pz()+1.e-13)); + if(y>fYMin && yGetFirstMother() - 1; + if(mi<0) continue; + mother = (TParticle*)fParticles.At(mi); + mpdg=TMath::Abs(mother->GetPdgCode()); + mpdgUpperFamily=(mpdg>1000 ? mpdg+1000 : mpdg+100); // keep e from c from b + if ( ParentSelected(mpdg) || + (fFlavorSelect==5 && ParentSelected(mpdgUpperFamily))) { + if (KinematicSelection(partCheck,1)) { + theChild=kTRUE; + } + } + } + } + if (!theQ || !theQbar || !inYcut) { // one of the c/b conditions not satisfied + delete[] pParent; + return 0; + } + if (fCutOnChild && !theChild) { // one of the child conditions not satisfied + delete[] pParent; + return 0; + } + + } + + //Introducing child cuts in case kPyW, kPyZ, kPyMb, and kPyMbNonDiff + if ( (fProcess == kPyW || + fProcess == kPyZ || + fProcess == kPyMbDefault || + fProcess == kPyMb || + fProcess == kPyMbAtlasTuneMC09 || + fProcess == kPyMbWithDirectPhoton || + fProcess == kPyMbNonDiffr) + && (fCutOnChild == 1) ) { + if ( !CheckKinematicsOnChild() ) { + delete[] pParent; + return 0; + } + } + + + for (i = 0; i < np; i++) { Int_t trackIt = 0; - TParticle * iparticle = (TParticle *) fParticles->At(i); + TParticle * iparticle = (TParticle *) fParticles.At(i); kf = CheckPDGCode(iparticle->GetPdgCode()); Int_t ks = iparticle->GetStatusCode(); Int_t km = iparticle->GetFirstMother(); if ((ks == 1 && kf!=0 && KinematicSelection(iparticle, 0)) || (ks != 1) || - (fProcess == kPyJets && ks == 21 && km == 0 && i>1)) { + ((fProcess == kPyJets || fProcess == kPyBeautyJets) && ks == 21 && km == 0 && i>1)) { nc++; if (ks == 1) trackIt = 1; Int_t ipa = iparticle->GetFirstMother()-1; @@ -640,36 +1127,24 @@ Int_t AliGenPythia::GenerateMB() 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 = fEventTime + kconv * iparticle->T(); PushTrack(fTrackIt*trackIt, iparent, kf, p[0], p[1], p[2], p[3], origin[0], origin[1], origin[2], tof, polar[0], polar[1], polar[2], kPPrimary, nt, 1., ks); - // - // 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)); - } - + fNprimaries++; KeepTrack(nt); pParent[i] = nt; + SetHighWaterMark(nt); + } // select particle } // particle loop - if (pParent) delete[] pParent; + delete[] pParent; - printf("\n I've put %i particles on the stack \n",nc); - return nc; + return 1; } @@ -688,7 +1163,7 @@ void AliGenPythia::FinishRun() printf("\nMean Q, x1, x2: %f %f %f\n", fQ, fX1, fX2); } -void AliGenPythia::AdjustWeights() +void AliGenPythia::AdjustWeights() const { // Adjust the weights after generation of all events // @@ -702,18 +1177,27 @@ void AliGenPythia::AdjustWeights() } } -void AliGenPythia::SetNuclei(Int_t a1, Int_t a2) +void AliGenPythia::SetNuclei(Int_t a1, Int_t a2, Int_t pdfset) { // Treat protons as inside nuclei with mass numbers a1 and a2 fAProjectile = a1; fATarget = a2; + fNucPdf = pdfset; // 0 EKS98 1 EPS08 fSetNuclei = kTRUE; } void AliGenPythia::MakeHeader() { +// +// Make header for the simulated event +// + if (gAlice) { + if (gAlice->GetEvNumber()>=fDebugEventFirst && + gAlice->GetEvNumber()<=fDebugEventLast) fPythia->Pylist(2); + } + // Builds the event header, to be called after each event if (fHeader) delete fHeader; fHeader = new AliGenPythiaEventHeader("Pythia"); @@ -726,13 +1210,20 @@ void AliGenPythia::MakeHeader() // // Event Vertex fHeader->SetPrimaryVertex(fVertex); + +// +// Number of primaries + fHeader->SetNProduced(fNprimaries); // // Jets that have triggered - if (fProcess == kPyJets) + + //Need to store jets for b-jet studies too! + if (fProcess == kPyJets || fProcess == kPyDirectGamma || fProcess == kPyBeautyJets || fProcess == kPyBeautyppMNRwmi) { Int_t ntrig, njet; Float_t jets[4][10]; GetJets(njet, ntrig, jets); + for (Int_t i = 0; i < ntrig; i++) { ((AliGenPythiaEventHeader*) fHeader)->AddJet(jets[0][i], jets[1][i], jets[2][i], @@ -761,19 +1252,42 @@ void AliGenPythia::MakeHeader() if (fQuench){ Double_t z[4]; Double_t xp, yp; + if (fQuench == 1) { + // Pythia::Quench() + fPythia->GetQuenchingParameters(xp, yp, z); + } else if (fQuench == 2){ + // Pyquen + Double_t r1 = PARIMP.rb1; + Double_t r2 = PARIMP.rb2; + Double_t b = PARIMP.b1; + Double_t r = 0.5 * TMath::Sqrt(2. * (r1 * r1 + r2 * r2) - b * b); + Double_t phi = PARIMP.psib1; + xp = r * TMath::Cos(phi); + yp = r * TMath::Sin(phi); + + } else if (fQuench == 4) { + // QPythia + Double_t xy[2]; + Double_t i0i1[2]; + AliFastGlauber::Instance()->GetSavedXY(xy); + AliFastGlauber::Instance()->GetSavedI0I1(i0i1); + xp = xy[0]; + yp = xy[1]; + ((AliGenPythiaEventHeader*) fHeader)->SetImpactParameter(fImpact); + } - fPythia->GetQuenchingParameters(xp, yp, z); - - ((AliGenPythiaEventHeader*) fHeader)->SetXYJet(xp, yp); - ((AliGenPythiaEventHeader*) fHeader)->SetZQuench(z); + ((AliGenPythiaEventHeader*) fHeader)->SetXYJet(xp, yp); + ((AliGenPythiaEventHeader*) fHeader)->SetZQuench(z); } - // -// Pass header to RunLoader +// Store pt^hard + ((AliGenPythiaEventHeader*) fHeader)->SetPtHard(fPythia->GetVINT(47)); +// +// Pass header // - AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(fHeader); + AddHeader(fHeader); + fHeader = 0x0; } - Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) { @@ -790,7 +1304,7 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) pdg[1] = jet2->GetPdgCode(); Bool_t triggered = kFALSE; - if (fProcess == kPyJets) { + if (fProcess == kPyJets || fProcess == kPyBeautyJets || fProcess == kPyBeautyppMNRwmi) { Int_t njets = 0; Int_t ntrig = 0; Float_t jets[4][10]; @@ -799,7 +1313,7 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) // GetJets(njets, ntrig, jets); - if (ntrig) triggered = kTRUE; + if (ntrig || fEtMinJet == 0.) triggered = kTRUE; // } else { Int_t ij = 0; @@ -822,66 +1336,143 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) } return triggered; } - -AliGenPythia& AliGenPythia::operator=(const AliGenPythia& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} -void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) -{ + + +Bool_t AliGenPythia::CheckKinematicsOnChild(){ // -// Load event into Pythia Common Block +//Checking Kinematics on Child (status code 1, particle code ?, kin cuts // + Bool_t checking = kFALSE; + Int_t j, kcode, ks, km; + Int_t nPartAcc = 0; //number of particles in the acceptance range + Int_t numberOfAcceptedParticles = 1; + if (fNumberOfAcceptedParticles != 0) { numberOfAcceptedParticles = fNumberOfAcceptedParticles; } + Int_t npart = fParticles.GetEntriesFast(); + + for (j = 0; jGetPdgCode()) ); + ks = jparticle->GetStatusCode(); + km = jparticle->GetFirstMother(); + + if( (ks == 1) && (kcode == fPdgCodeParticleforAcceptanceCut) && (KinematicSelection(jparticle,1)) ){ + nPartAcc++; + } + if( numberOfAcceptedParticles <= nPartAcc){ + checking = kTRUE; + break; + } + } - Int_t npart = stack -> GetNprimary(); - Int_t n0 = 0; + return checking; +} + +void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) +{ + // + // Load event into Pythia Common Block + // + + Int_t npart = stack -> GetNprimary(); + Int_t n0 = 0; + + if (!flag) { + (fPythia->GetPyjets())->N = npart; + } else { + n0 = (fPythia->GetPyjets())->N; + (fPythia->GetPyjets())->N = n0 + npart; + } + + + for (Int_t part = 0; part < npart; part++) { + TParticle *mPart = stack->Particle(part); - if (!flag) { - (fPythia->GetPyjets())->N = npart; - } else { - n0 = (fPythia->GetPyjets())->N; - (fPythia->GetPyjets())->N = n0 + npart; + Int_t kf = mPart->GetPdgCode(); + Int_t ks = mPart->GetStatusCode(); + Int_t idf = mPart->GetFirstDaughter(); + Int_t idl = mPart->GetLastDaughter(); + + if (reHadr) { + if (ks == 11 || ks == 12) { + ks -= 10; + idf = -1; + idl = -1; + } } + Float_t px = mPart->Px(); + Float_t py = mPart->Py(); + Float_t pz = mPart->Pz(); + Float_t e = mPart->Energy(); + Float_t m = mPart->GetCalcMass(); - for (Int_t part = 0; part < npart; part++) { - TParticle *MPart = stack->Particle(part); - - Int_t kf = MPart->GetPdgCode(); - Int_t ks = MPart->GetStatusCode(); - Int_t idf = MPart->GetFirstDaughter(); - Int_t idl = MPart->GetLastDaughter(); - - if (reHadr) { + + (fPythia->GetPyjets())->P[0][part+n0] = px; + (fPythia->GetPyjets())->P[1][part+n0] = py; + (fPythia->GetPyjets())->P[2][part+n0] = pz; + (fPythia->GetPyjets())->P[3][part+n0] = e; + (fPythia->GetPyjets())->P[4][part+n0] = m; + + (fPythia->GetPyjets())->K[1][part+n0] = kf; + (fPythia->GetPyjets())->K[0][part+n0] = ks; + (fPythia->GetPyjets())->K[3][part+n0] = idf + 1; + (fPythia->GetPyjets())->K[4][part+n0] = idl + 1; + (fPythia->GetPyjets())->K[2][part+n0] = mPart->GetFirstMother() + 1; + } +} + +void AliGenPythia::LoadEvent(TObjArray* stack, Int_t flag, Int_t reHadr) +{ + // + // Load event into Pythia Common Block + // + + Int_t npart = stack -> GetEntries(); + Int_t n0 = 0; + + if (!flag) { + (fPythia->GetPyjets())->N = npart; + } else { + n0 = (fPythia->GetPyjets())->N; + (fPythia->GetPyjets())->N = n0 + npart; + } + + + for (Int_t part = 0; part < npart; part++) { + TParticle *mPart = dynamic_cast(stack->At(part)); + Int_t kf = mPart->GetPdgCode(); + Int_t ks = mPart->GetStatusCode(); + Int_t idf = mPart->GetFirstDaughter(); + Int_t idl = mPart->GetLastDaughter(); + + if (reHadr) { if (ks == 11 || ks == 12) { - ks -= 10; - idf = -1; - idl = -1; + ks -= 10; + idf = -1; + idl = -1; } - } - - Float_t px = MPart->Px(); - Float_t py = MPart->Py(); - Float_t pz = MPart->Pz(); - Float_t e = MPart->Energy(); - Float_t m = MPart->GetCalcMass(); - - - (fPythia->GetPyjets())->P[0][part+n0] = px; - (fPythia->GetPyjets())->P[1][part+n0] = py; - (fPythia->GetPyjets())->P[2][part+n0] = pz; - (fPythia->GetPyjets())->P[3][part+n0] = e; - (fPythia->GetPyjets())->P[4][part+n0] = m; - - (fPythia->GetPyjets())->K[1][part+n0] = kf; - (fPythia->GetPyjets())->K[0][part+n0] = ks; - (fPythia->GetPyjets())->K[3][part+n0] = idf + 1; - (fPythia->GetPyjets())->K[4][part+n0] = idl + 1; - (fPythia->GetPyjets())->K[2][part+n0] = MPart->GetFirstMother() + 1; } + + Float_t px = mPart->Px(); + Float_t py = mPart->Py(); + Float_t pz = mPart->Pz(); + Float_t e = mPart->Energy(); + Float_t m = mPart->GetCalcMass(); + + + (fPythia->GetPyjets())->P[0][part+n0] = px; + (fPythia->GetPyjets())->P[1][part+n0] = py; + (fPythia->GetPyjets())->P[2][part+n0] = pz; + (fPythia->GetPyjets())->P[3][part+n0] = e; + (fPythia->GetPyjets())->P[4][part+n0] = m; + + (fPythia->GetPyjets())->K[1][part+n0] = kf; + (fPythia->GetPyjets())->K[0][part+n0] = ks; + (fPythia->GetPyjets())->K[3][part+n0] = idf + 1; + (fPythia->GetPyjets())->K[4][part+n0] = idl + 1; + (fPythia->GetPyjets())->K[2][part+n0] = mPart->GetFirstMother() + 1; + } } @@ -953,7 +1544,6 @@ void AliGenPythia::GetJets(Int_t& nJets, Int_t& nJetsTrig, Float_t jets[4][10]) Float_t theta = TMath::ATan2(pt,pz); Float_t et = e * TMath::Sin(theta); Float_t eta = -TMath::Log(TMath::Tan(theta / 2.)); - if ( eta > fEtaMinJet && eta < fEtaMaxJet && phi > fPhiMinJet && phi < fPhiMaxJet && @@ -972,6 +1562,92 @@ void AliGenPythia::GetJets(Int_t& nJets, Int_t& nJetsTrig, Float_t jets[4][10]) } } +void AliGenPythia::GetSubEventTime() +{ + // Calculates time of the next subevent + fEventTime = 0.; + if (fEventsTime) { + TArrayF &array = *fEventsTime; + fEventTime = array[fCurSubEvent++]; + } + // printf(" Event time: %d %f %p",fCurSubEvent,fEventTime,fEventsTime); + return; +} + +Bool_t AliGenPythia::IsInEMCAL(Float_t phi, Float_t eta) +{ + // Is particle in EMCAL acceptance? + // phi in degrees, etamin=-etamax + if(phi > fEMCALMinPhi && phi < fEMCALMaxPhi && + eta < fEMCALEta ) + return kTRUE; + else + return kFALSE; +} + +Bool_t AliGenPythia::IsInPHOS(Float_t phi, Float_t eta) +{ + // Is particle in PHOS acceptance? + // Acceptance slightly larger considered. + // phi in degrees, etamin=-etamax + if(phi > fPHOSMinPhi && phi < fPHOSMaxPhi && + eta < fPHOSEta ) + return kTRUE; + else + return kFALSE; +} + +void AliGenPythia::RotatePhi(Int_t iphcand, Bool_t& okdd) +{ + //calculate the new position random between fPHOSMinPhi and fPHOSMaxPhi + Double_t phiPHOSmin = TMath::Pi()*fPHOSMinPhi/180; + Double_t phiPHOSmax = TMath::Pi()*fPHOSMaxPhi/180; + Double_t phiPHOS = gRandom->Uniform(phiPHOSmin,phiPHOSmax); + + //calculate deltaphi + TParticle* ph = (TParticle *) fParticles.At(iphcand); + Double_t phphi = ph->Phi(); + Double_t deltaphi = phiPHOS - phphi; + + + + //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; + for(Int_t i=0; i< np; i++) { + TParticle* iparticle = (TParticle *) fParticles.At(i); + oldphi = iparticle->Phi(); + newphi = oldphi + deltaphi; + 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 + 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 + + // apply rotation + iparticle->SetProductionVertex(newVx, newVy, Vz, time); + iparticle->SetMomentum(newPx, newPy, Pz, e); + + } //end particle loop + + // now let's check that we put correctly the candidate photon in PHOS + Float_t phi = ph->Phi()*180./TMath::Pi(); //Convert to degrees + Float_t eta =TMath::Abs(ph->Eta());//in calos etamin=-etamax + if(IsInPHOS(phi,eta)) + okdd = kTRUE; +} + #ifdef never void AliGenPythia::Streamer(TBuffer &R__b) @@ -1015,3 +1691,4 @@ void AliGenPythia::Streamer(TBuffer &R__b) #endif +