X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PYTHIA6%2FAliGenPythia.cxx;h=80335bdf29cfc3fcf73d758d556724729bad5a01;hb=19ef8cf0945f154847e3814eeb542c7736b5a59d;hp=9d4725a415d641ec72e99425ce61d3b304227eeb;hpb=e0e89f4007c47fe713d03a4181ebec4b1e64d5f8;p=u%2Fmrichter%2FAliRoot.git diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx index 9d4725a415d..80335bdf29c 100644 --- a/PYTHIA6/AliGenPythia.cxx +++ b/PYTHIA6/AliGenPythia.cxx @@ -25,6 +25,7 @@ // andreas.morsch@cern.ch // +#include #include #include #include @@ -41,102 +42,194 @@ #include "AliStack.h" #include "AliRunLoader.h" #include "AliMC.h" -#include "pyquenCommon.h" +#include "PyquenCommon.h" ClassImp(AliGenPythia) -AliGenPythia::AliGenPythia() - :AliGenMC() + +AliGenPythia::AliGenPythia(): + AliGenMC(), + fProcess(kPyCharm), + 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), + 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), + fTriggerParticle(0), + fTriggerEta(0.9), + fTriggerMultiplicity(0), + fTriggerMultiplicityEta(0), + fCountMode(kCountAll), + fHeader(0), + fRL(0), + fFileName(0), + fFragPhotonInCalo(kFALSE), + fPi0InCalo(kFALSE) , + fPhotonInCalo(kFALSE), + fCheckEMCAL(kFALSE), + fCheckPHOS(kFALSE), + fCheckPHOSeta(kFALSE), + fFragPhotonOrPi0MinPt(0), + fPhotonMinPt(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; - fEventTime = 0.; - fInteractionRate = 0.; - fTimeWindow = 0.; - fEventsTime = 0; - fCurSubEvent = 0; - fDecayer = new AliDecayerPythia(); - SetEventListRange(); - SetJetPhiRange(); - SetJetEtaRange(); - SetJetEtRange(); - SetGammaPhiRange(); - SetGammaEtaRange(); - SetPtKick(); - SetQuench(); - SetHadronisation(); - SetTriggerParticle(); - fSetNuclei = kFALSE; - fNewMIS = kFALSE; - fHFoff = kFALSE; + fEnergyCMS = 5500.; + SetNuclei(0,0); if (!AliPythiaRndm::GetPythiaRandom()) - AliPythiaRndm::SetPythiaRandom(GetRandom()); + AliPythiaRndm::SetPythiaRandom(GetRandom()); } AliGenPythia::AliGenPythia(Int_t npart) - :AliGenMC(npart) + :AliGenMC(npart), + fProcess(kPyCharm), + 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), + 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), + fTriggerParticle(0), + fTriggerEta(0.9), + fTriggerMultiplicity(0), + fTriggerMultiplicityEta(0), + fCountMode(kCountAll), + fHeader(0), + fRL(0), + fFileName(0), + fFragPhotonInCalo(kFALSE), + fPi0InCalo(kFALSE) , + fPhotonInCalo(kFALSE), + fCheckEMCAL(kFALSE), + fCheckPHOS(kFALSE), + fCheckPHOSeta(kFALSE), + fFragPhotonOrPi0MinPt(0), + fPhotonMinPt(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; - fEventTime = 0.; - fInteractionRate = 0.; - fTimeWindow = 0.; - fEventsTime = 0; - fCurSubEvent = 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(); - SetTriggerParticle(); - // 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; - fNewMIS = kFALSE; - fHFoff = kFALSE; -} - -AliGenPythia::AliGenPythia(const AliGenPythia & Pythia) - :AliGenMC(Pythia) -{ -// copy constructor - Pythia.Copy(*this); -} + SetNuclei(0,0); + } AliGenPythia::~AliGenPythia() { @@ -228,9 +321,6 @@ void AliGenPythia::Init() // fParentWeight=1./Float_t(fNpart); // -// Forward Paramters to the AliPythia object - fDecayer->SetForceDecay(fForceDecay); - fDecayer->Init(); fPythia->SetCKIN(3,fPtHardMin); @@ -254,7 +344,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); } @@ -267,14 +358,22 @@ void AliGenPythia::Init() } else { fRL = 0x0; } + // + fPythia->ProcInit(fProcess,fEnergyCMS,fStrucFunc); + // 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); - for (Int_t i = 156; i <= 160; i++) fPythia->SetMDME(i, 1, 0); + // Switch off g->QQbar splitting in decay table + ((AliDecayerPythia*) fDecayer)->HeavyFlavourOff(); } - // - fPythia->ProcInit(fProcess,fEnergyCMS,fStrucFunc); + + fDecayer->Init(); + // Parent and Children Selection switch (fProcess) @@ -341,10 +440,13 @@ void AliGenPythia::Init() case kPyJpsi: fParentSelect[0] = 443; break; + case kPyMbDefault: case kPyMb: case kPyMbNonDiffr: + case kPyMbMSEL1: case kPyJets: case kPyDirectGamma: + case kPyLhwgMb: break; case kPyW: case kPyZ: @@ -356,17 +458,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; @@ -385,17 +487,28 @@ void AliGenPythia::Init() fDyBoost = 0; Warning("Init","SetNuclei used. Use SetProjectile + SetTarget instead. fDyBoost has been reset to 0\n"); } - + if (fQuench) { fPythia->InitQuenching(0., 0.1, 0.6e6, 0); } - + fPythia->SetPARJ(200, 0.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 + } } void AliGenPythia::Generate() { // Generate one event - + if (!fPythia) fPythia=(AliPythia*) fMCEvGen; fDecayer->ForceDecay(); Float_t polar[3] = {0,0,0}; @@ -450,7 +563,10 @@ 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 // @@ -460,15 +576,15 @@ void AliGenPythia::Generate() // printf("Calling hadronisation %d\n", fPythia->GetN()); fPythia->Pyexec(); fTrials++; - fPythia->ImportParticles(fParticles,"All"); + fPythia->ImportParticles(&fParticles,"All"); Boost(); // // // Int_t i; - - Int_t np = fParticles->GetEntriesFast(); + fNprimaries = 0; + Int_t np = fParticles.GetEntriesFast(); if (np == 0) continue; // @@ -486,14 +602,19 @@ 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 != kPyJets && fProcess != kPyDirectGamma && fProcess != kPyMbNonDiffr && - fProcess != kPyW && fProcess != kPyZ && - fProcess != kPyCharmppMNRwmi && fProcess != kPyBeautyppMNRwmi) { + fProcess != kPyMbMSEL1 && + fProcess != kPyW && + fProcess != kPyZ && + fProcess != kPyCharmppMNRwmi && + fProcess != kPyBeautyppMNRwmi) { 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 @@ -520,20 +641,20 @@ void AliGenPythia::Generate() if (kf >= fFlavorSelect && kf <= 6) { Int_t idau = iparticle->GetFirstDaughter() - 1; if (idau > -1) { - TParticle* daughter = (TParticle *) fParticles->At(idau); + 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 j = jmin; j <= jmax; j++) - ((TParticle *) fParticles->At(j))->SetFirstMother(i+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()); } @@ -627,7 +748,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(); @@ -649,7 +770,8 @@ void AliGenPythia::Generate() polar[0], polar[1], polar[2], kPPrimary, nt, 1., ks); pParent[i] = nt; - KeepTrack(nt); + KeepTrack(nt); + fNprimaries++; } // PushTrack loop } } else { @@ -658,9 +780,9 @@ void AliGenPythia::Generate() GetSubEventTime(); - if (pParent) delete[] pParent; - if (pSelected) delete[] pSelected; - if (trackIt) delete[] trackIt; + delete[] pParent; + delete[] pSelected; + delete[] trackIt; if (nc > 0) { switch (fCountMode) { @@ -712,30 +834,135 @@ 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; + 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; } + + // 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 > 20) + continue; + + // skip quarks and gluons + Int_t pdgCode = TMath::Abs(iparticle->GetPdgCode()); + if (pdgCode <= 10 || pdgCode == 21) + continue; + + if (fTriggerMultiplicityEta > 0 && TMath::Abs(iparticle->Eta()) > fTriggerMultiplicityEta) + 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); + } + + // Select events with a photon pt > 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); + TParticle * iparticle = (TParticle *) fParticles.At(i); kf = CheckPDGCode(iparticle->GetPdgCode()); - if (TMath::Abs(kf) != fTriggerParticle) continue; + if (kf != fTriggerParticle) continue; if (iparticle->Pt() == 0.) continue; if (TMath::Abs(iparticle->Eta()) > fTriggerEta) continue; triggered = kTRUE; break; } - if (!triggered) return 0; + if (!triggered) { + delete [] pParent; + return 0; + } } @@ -747,7 +974,7 @@ Int_t AliGenPythia::GenerateMB() Float_t yQ; Int_t pdgQ; for(i=0; iAt(i); + hvq = (TParticle*)fParticles.At(i); pdgQ = hvq->GetPdgCode(); if(TMath::Abs(pdgQ) != fFlavorSelect) continue; if(pdgQ>0) { theQ=kTRUE; } else { theQbar=kTRUE; } @@ -756,16 +983,20 @@ Int_t AliGenPythia::GenerateMB() if(yQ>fYMin && yQAt(i); + TParticle * iparticle = (TParticle *) fParticles.At(i); kf = CheckPDGCode(iparticle->GetPdgCode()); Int_t ks = iparticle->GetStatusCode(); Int_t km = iparticle->GetFirstMother(); @@ -805,6 +1036,7 @@ Int_t AliGenPythia::GenerateMB() origin[0], origin[1], origin[2], tof, polar[0], polar[1], polar[2], kPPrimary, nt, 1., ks); + fNprimaries++; // // Special Treatment to store color-flow // @@ -826,7 +1058,7 @@ Int_t AliGenPythia::GenerateMB() } // select particle } // particle loop - if (pParent) delete[] pParent; + delete[] pParent; return 1; } @@ -847,7 +1079,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 // @@ -873,6 +1105,9 @@ void AliGenPythia::SetNuclei(Int_t a1, Int_t a2) void AliGenPythia::MakeHeader() { +// +// Make header for the simulated event +// if (gAlice) { if (gAlice->GetEvNumber()>=fDebugEventFirst && gAlice->GetEvNumber()<=fDebugEventLast) fPythia->Pylist(2); @@ -890,10 +1125,14 @@ void AliGenPythia::MakeHeader() // // Event Vertex fHeader->SetPrimaryVertex(fVertex); + +// +// Number of primaries + fHeader->SetNProduced(fNprimaries); // // Jets that have triggered - if (fProcess == kPyJets) + if (fProcess == kPyJets || fProcess == kPyDirectGamma) { Int_t ntrig, njet; Float_t jets[4][10]; @@ -951,19 +1190,9 @@ void AliGenPythia::MakeHeader() // Pass header // AddHeader(fHeader); + fHeader = 0x0; } -void AliGenPythia::AddHeader(AliGenEventHeader* header) -{ - // Add header to container or runloader - if (fContainer) { - fContainer->AddHeader(header); - } else { - AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header); - } -} - - Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) { // Check the kinematic trigger condition @@ -988,7 +1217,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; @@ -1013,18 +1242,20 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2) } -//Checking Kinematics on Child (status code 1, particle code ?, kin cuts -Bool_t AliGenPythia::CheckKinematicsOnChild(){ +Bool_t AliGenPythia::CheckKinematicsOnChild(){ +// +//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(); + Int_t npart = fParticles.GetEntriesFast(); for (j = 0; jAt(j); + TParticle * jparticle = (TParticle *) fParticles.At(j); kcode = TMath::Abs( CheckPDGCode(jparticle->GetPdgCode()) ); ks = jparticle->GetStatusCode(); km = jparticle->GetFirstMother(); @@ -1041,14 +1272,6 @@ Bool_t AliGenPythia::CheckKinematicsOnChild(){ return checking; } - -AliGenPythia& AliGenPythia::operator=(const AliGenPythia& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) { // @@ -1067,12 +1290,12 @@ void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) for (Int_t part = 0; part < npart; part++) { - TParticle *MPart = stack->Particle(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(); + 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) { @@ -1082,11 +1305,11 @@ void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) } } - 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(); + 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; @@ -1099,7 +1322,7 @@ void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) (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; + (fPythia->GetPyjets())->K[2][part+n0] = mPart->GetFirstMother() + 1; } } @@ -1202,6 +1425,81 @@ void AliGenPythia::GetSubEventTime() 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) {