From 20a467e1c806df41a2e9742a287d1af6c1101923 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Mon, 3 Aug 2026 16:35:34 +0800 Subject: [PATCH 01/15] coh jpsi --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 26 ++++++++++++++ ...ctedPhotoproucedCharmoniaMidy_PbPb5TeV.ini | 6 ++++ ...runPhotoproducedCharmonia_midy_PbPb5TeV.sh | 34 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C create mode 100644 MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini create mode 100644 MC/run/PWGDQ/runPhotoproducedCharmonia_midy_PbPb5TeV.sh diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C new file mode 100644 index 000000000..caf6f6471 --- /dev/null +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -0,0 +1,26 @@ +R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator) +#include "GeneratorCocktail.C" +#include "GeneratorStarlightToEvtGen.C" + +#include + +FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV() +{ + float energyCM = 5360; + int beam1Z = 82; + int beam1A = 208; + int beam2Z = 82; + int beam2A = 208; + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genCohJpsi = new o2::eventgen::GeneratorStarlightToEvtGen("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A); + genCocktailEvtGen->AddGenerator(genCohJpsi, 1); + auto genIncohJpsi = new o2::eventgen::GeneratorStarlightToEvtGen("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A); + genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); + auto genTwoGammaToEl = new o2::eventgen::GeneratorStarlight("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A); + genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); + auto genCohPsi2S = new o2::eventgen::GeneratorStarlightToEvtGen("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A); + genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); + auto genIncohPsi2S = new o2::eventgen::GeneratorStarlightToEvtGen("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A); + genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); + return genCocktailEvtGen; +} \ No newline at end of file diff --git a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini new file mode 100644 index 000000000..bc7aff04f --- /dev/null +++ b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini @@ -0,0 +1,6 @@ +[GeneratorExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +funcName = GeneratorCocktailStarlightMidy_PbPb5TeV() +[TriggerExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C +funcName = selectMotherPartInAcc(-1.5,1.5) diff --git a/MC/run/PWGDQ/runPhotoproducedCharmonia_midy_PbPb5TeV.sh b/MC/run/PWGDQ/runPhotoproducedCharmonia_midy_PbPb5TeV.sh new file mode 100644 index 000000000..4347822d7 --- /dev/null +++ b/MC/run/PWGDQ/runPhotoproducedCharmonia_midy_PbPb5TeV.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +RNDSEED=${RNDSEED:-0} +NWORKERS=${NWORKERS:-8} + + +export ALIEN_JDL_LPMPRODUCTIONTYPE=MC +export ALIEN_JDL_CPULIMIT=20 +export ALIEN_JDL_LPMANCHORPASSNAME=apass4 +export ALIEN_JDL_MCANCHOR=apass4 +export ALIEN_JDL_COLLISIONSYSTEM=PbPb +export ALIEN_JDL_LPMPASSNAME=apass4 +export ALIEN_JDL_LPMRUNNUMBER=544474 +export ALIEN_JDL_LPMANCHORRUN=544474 + +export ALIEN_JDL_LPMINTERACTIONTYPE=PbPb +export ALIEN_JDL_LPMPRODUCTIONTAG="TestProd" +export ALIEN_JDL_LPMANCHORPRODUCTION="TestProd" +export ALIEN_JDL_LPMANCHORYEAR=2023 + +export ALIEN_JDL_O2DPGWORKFLOWTARGET="aod" + +export PRODSPLIT=${ALIEN_O2DPG_GRIDSUBMIT_PRODSPLIT:-10} +export SPLITID=${ALIEN_O2DPG_GRIDSUBMIT_SUBJOBID:-10} +export CYCLE=0 +export NTIMEFRAMES=8 +export NSIGEVENTS=20 +export NBKGEVENTS=10 + +CONFIGNAME=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini + +export ALIEN_JDL_ANCHOR_SIM_OPTIONS="-eCM 5360 -gen external -j ${NWORKERS} -tf ${NTIMEFRAMES} -e TGeant4 -seed 0 -ini ${CONFIGNAME} -genBkg pythia8 -procBkg \"heavy_ion\" -colBkg PbPb --embedding -nb $NBKGEVENTS --embeddPattern @0:e2" + +${O2DPG_ROOT}/MC/run/ANCHOR/anchorMC.sh \ No newline at end of file From 1a2f683b18e1492ddb0ad90d0c69123900f9f2cc Mon Sep 17 00:00:00 2001 From: ypwangg Date: Thu, 6 Aug 2026 14:43:48 +0200 Subject: [PATCH 02/15] set up for photoproduction at midrapidity --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 55 ++++++++++++++----- ...ctedPhotoproucedCharmoniaMidy_PbPb5TeV.ini | 2 + 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index caf6f6471..1463c9fb9 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -1,26 +1,53 @@ R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator) +R__ADD_INCLUDE_PATH($O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen) #include "GeneratorCocktail.C" -#include "GeneratorStarlightToEvtGen.C" - +#include "GeneratorStarlight.C" +#include "GeneratorEvtGen.C" #include -FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV() +namespace +{ +o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string configuration, + float energyCM, + int beam1Z, + int beam1A, + int beam2Z, + int beam2A, + std::string extraParams = "", + std::string dpmjetconf = "") { - float energyCM = 5360; - int beam1Z = 82; - int beam1A = 208; - int beam2Z = 82; - int beam2A = 208; - auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = new o2::eventgen::GeneratorStarlightToEvtGen("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A); + auto generator = new o2::eventgen::GeneratorStarlight_class(); + generator->selectConfiguration(configuration); + generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); + generator->setExtraParams(extraParams); + generator->setupDpmjet(dpmjetconf); + return generator; +} +} // namespace + +FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") +{ + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); - auto genIncohJpsi = new o2::eventgen::GeneratorStarlightToEvtGen("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genTwoGammaToEl = new o2::eventgen::GeneratorStarlight("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A); + auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = new o2::eventgen::GeneratorStarlightToEvtGen("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); - auto genIncohPsi2S = new o2::eventgen::GeneratorStarlightToEvtGen("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); + + TString pdgs = "443;100443"; + std::string spdg; + TObjArray* obj = pdgs.Tokenize(";"); + genCocktailEvtGen->SetSizePdg(obj->GetEntriesFast()); + for (int i = 0; i < obj->GetEntriesFast(); i++) { + spdg = obj->At(i)->GetName(); + genCocktailEvtGen->AddPdg(std::stoi(spdg), i); + printf("PDG %d \n", std::stoi(spdg)); + } + genCocktailEvtGen->SetForceDecay(kEvtPsiPrimeJpsiDiElectron); return genCocktailEvtGen; } \ No newline at end of file diff --git a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini index bc7aff04f..4d2931f03 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini @@ -4,3 +4,5 @@ funcName = GeneratorCocktailStarlightMidy_PbPb5TeV() [TriggerExternal] fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C funcName = selectMotherPartInAcc(-1.5,1.5) +[GeneratorPythia8] +config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg From 05a9af3694f641b8c13cc20e4ee8b51e3d0b2cdf Mon Sep 17 00:00:00 2001 From: ypwangg Date: Thu, 20 Aug 2026 16:15:29 +0200 Subject: [PATCH 03/15] test file for photoproduction --- ...jectedPhotoproucedCharmoniaMidy_PbPb5TeV.C | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C new file mode 100644 index 000000000..b5bfbd1a3 --- /dev/null +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C @@ -0,0 +1,102 @@ +int External() { + std::string path{"o2sim_Kine.root"}; + TFile file(path.c_str(), "READ"); + if (file.IsZombie()) { + std::cerr << "Cannot open ROOT file " << path << "\n"; + return 1; + } + auto tree = (TTree *)file.Get("o2sim"); + if (!tree) + { + std::cerr << "Cannot find tree o2sim in file " << path << "\n"; + return 1; + } + std::vector* tracks{}; + tree->SetBranchAddress("MCTrack", &tracks); + + int checkPdgSignal[2] = {443, 100443}; + int checkPdgDecay = 11; + double rapiditymin = -1.5; double rapiditymax = 1.5; + + int nLeptons{}; + int nAntileptons{}; + int nLeptonPairs{}; + int nPrimaryLepton{}; + int nPrimaryAntilepton{}; + int nLeptonPairsToBeDone{}; + int nSignalJpsi{}; + int nSignalPsi2S{}; + int nPions{}; + int nPhotonsFromPsi{}; + int nPhotonsFromJPsi{}; + int nSignalJpsiWithinAcc{}; + int nSignalPsi2SWithinAcc{}; + + auto nEvents = tree->GetEntries(); + for (int i = 0; i < nEvents; i++) { + tree->GetEntry(i); + for (auto& track : *tracks) { + auto pdg = track.GetPdgCode(); + auto rapidity = track.GetRapidity(); + auto idMoth = track.getMotherTrackId(); + if (pdg == checkPdgDecay) { + // count leptons + nLeptons++; + if (idMoth == -1) nPrimaryLepton++; + } else if (pdg == -checkPdgDecay) { + // count anti-leptons + nAntileptons++; + if (idMoth == -1) nPrimaryAntilepton++; + } else if (pdg == checkPdgSignal[0] || pdg == checkPdgSignal[1]) { + if (idMoth < 0) { + // count signal PDG + pdg == checkPdgSignal[0] ? nSignalJpsi++ : nSignalPsi2S++; + // count signal PDG within acceptance + if (rapidity > rapiditymin && rapidity < rapiditymax) { + pdg == checkPdgSignal[0] ? nSignalJpsiWithinAcc++ : nSignalPsi2SWithinAcc++; + } + } + int child0Id = track.getFirstDaughterTrackId(); + int child1Id = track.getLastDaughterTrackId(); + for (int iDaugh = child0Id; iDaugh <= child1Id; iDaugh++) { + auto daugh = tracks->at(iDaugh); + if (daugh.GetPdgCode() == 22) { + if (pdg == checkPdgSignal[0]) { + nPhotonsFromJPsi++; + } else if (pdg == checkPdgSignal[1]) { + nPhotonsFromPsi++; + } + } + if (TMath::Abs(daugh.GetPdgCode()) == 211) nPions++; + } + auto child0 = o2::mcutils::MCTrackNavigator::getDaughter0(track, *tracks); + auto child1 = o2::mcutils::MCTrackNavigator::getDaughter1(track, *tracks); + if (child0 != nullptr && child1 != nullptr) { + // check for parent-child relations + auto pdg0 = child0->GetPdgCode(); + auto pdg1 = child1->GetPdgCode(); + std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { + nLeptonPairs++; + if (child0->getToBeDone() && child1->getToBeDone()) { + nLeptonPairsToBeDone++; + } + } + } + } + } + } + + std::cout << "#events: " << nEvents << "\n" + << "#leptons: " << nLeptons << "\n" + << "#antileptons: " << nAntileptons << "\n" + << "#primary leptons: " << nPrimaryLepton << "\n" + << "#primary antileptons: " << nPrimaryAntilepton << "\n" + << "#signal (prompt Jpsi): " << nSignalJpsi << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalJpsiWithinAcc << "\n" + << "#signal (prompt Psi(2S)): " << nSignalPsi2S << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalPsi2SWithinAcc << "\n" + << "#photons from Jpsi: " << nPhotonsFromJPsi <<" #photons from Psi(2S): "<< nPhotonsFromPsi<<"\n" + << "#pions from Psi(2S): "<< nPions<<"\n" + << "#lepton pairs: " << nLeptonPairs <<" #lepton pairs to be done: "<< nLeptonPairsToBeDone<<"\n"; + + return 0; +} \ No newline at end of file From 411629cd86471ebc34bca54758b4c9ffc45afabd Mon Sep 17 00:00:00 2001 From: ypwangg Date: Mon, 24 Aug 2026 10:57:39 +0200 Subject: [PATCH 04/15] update test file --- .../Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C index b5bfbd1a3..fe55e024a 100644 --- a/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.C @@ -75,7 +75,9 @@ int External() { // check for parent-child relations auto pdg0 = child0->GetPdgCode(); auto pdg1 = child1->GetPdgCode(); - std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + // std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[0]) std::cout << "First and last children of parent Jpsi are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[1]) std::cout << "First and last children of parent Psi(2S) are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { nLeptonPairs++; if (child0->getToBeDone() && child1->getToBeDone()) { From b0cc953076e772db297695e1aba3d9fb60463045 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Tue, 1 Sep 2026 11:12:48 +0200 Subject: [PATCH 05/15] update photoproduction generator --- ...rator_pythia8_StarlightTriggered_withGap.C | 155 ++++++++++++++++++ ...ctedPhotoproucedCharmoniaMidy_PbPb5TeV.ini | 9 +- 2 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C new file mode 100644 index 000000000..08a0ab760 --- /dev/null +++ b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C @@ -0,0 +1,155 @@ +#include "FairGenerator.h" +#include "Generators/GeneratorPythia8.h" +#include "Pythia8/Pythia.h" +#include "TRandom.h" +#include "GeneratorCocktailStarlight_PbPb5TeV.C" +#include + +using namespace o2::eventgen; +using namespace Pythia8; + +namespace o2 +{ +namespace eventgen +{ + + +class GeneratorPythia8StarlightTriggeredWithGap : public o2::eventgen::GeneratorPythia8 { +public: + + /// default constructor + GeneratorPythia8StarlightTriggeredWithGap() = default; + + /// constructor + GeneratorPythia8StarlightTriggeredWithGap(int inputTriggerRatio = 5, int gentype = 0) { + mGeneratedEvents = 0; + mInverseTriggerRatio = inputTriggerRatio; + switch (gentype) { + case 0: // generate prompt charmonia cocktail at mid rapidity at 5TeV + mGeneratorParam = (Generator*)GeneratorCocktailStarlightMidy_PbPb5TeV(); + break; + } + mGeneratorParam->Init(); + + addSubGenerator(0, "Minimum bias"); + addSubGenerator(1, "event with injected signals"); + } + + /// Deconstructor + ~GeneratorPythia8StarlightTriggeredWithGap() = default; + + void addSignalPDGs(int pdg) { mSignalsPDGs.push_back(pdg); }; + + void setRapidityRange(double valMin, double valMax) + { + mHadronRapidityMin = valMin; + mHadronRapidityMax = valMax; + }; + +protected: + Bool_t generateEvent() override + { + // GeneratorPythia8::generateEvent(); + bool genOk = false; + if (mGeneratedEvents % mInverseTriggerRatio == 0){ // add injected prompt signals to the stack + // bool found = false; + std::cout<<"generating event with injected signals"<generateEvent(); + found = findSignalInAcceptance(); + } + } + notifySubGenerator(1); + } else { // gap event + while (!genOk) { + genOk = GeneratorPythia8::generateEvent(); + } + notifySubGenerator(0); + } + mGeneratedEvents++; + std::cout<<"generated events: "<importParticles(); + int originalSize = mParticles.size(); + for(int ipart=0; ipart < mGeneratorParam->getParticles().size(); ipart++){ + TParticle part = TParticle(mGeneratorParam->getParticles().at(ipart)); + if(part.GetFirstMother() >= 0) part.SetFirstMother(part.GetFirstMother() + originalSize); + if(part.GetFirstDaughter() >= 0) part.SetFirstDaughter(part.GetFirstDaughter() + originalSize); + if(part.GetLastDaughter() >= 0) part.SetLastDaughter(part.GetLastDaughter() + originalSize); + mParticles.push_back(part); + // encodeParticleStatusAndTracking method already called in GeneratorEvtGen.C + } + mGeneratorParam->clearParticles(); + } + + return true; + } + + bool findSignalInAcceptance() { + std::cout<<"loop over" << mGeneratorParam->getParticles().size()<<" particles"<getParticles().size(); ipart++) { + TParticle part = TParticle(mGeneratorParam->getParticles().at(ipart)); + // make sure all signals are in the acceptance + for (int pdg : mSignalsPDGs) { + if (part.GetPdgCode() == pdg) { + std::cout<<"found signal with pdg: "< mHadronRapidityMax) { + return false; + } + } + } + } + // if (std::find(mSignalsPDGs.begin(), mSignalsPDGs.end(), part.GetPdgCode()) != mSignalsPDGs.end()) { + // std::cout<<"found signal with pdg: "< mHadronRapidityMax) { + // return false; + // } + // } + // } + } + std::cout<<"generated signal in acceptance"< mSignalsPDGs; + double mHadronRapidityMin; + double mHadronRapidityMax; +}; +} +} + +FairGenerator* + GeneratorPhotoproduction_Midy(int triggerGap, int gentype = 0, double rapidityMin = -1.5, double rapidityMax = 1.5) +{ + auto gen = new o2::eventgen::GeneratorPythia8StarlightTriggeredWithGap(triggerGap, gentype); + gen->setRapidityRange(rapidityMin, rapidityMax); + gen->addSignalPDGs(443); // J/Psi + gen->addSignalPDGs(100443); // Psi(2S) + gen->addSignalPDGs(11); // e +// auto seed = (gRandom->TRandom::GetSeed() % 900000000); +// gen->readString("Random:setSeed on"); +// gen->readString("Random:seed " + std::to_string(seed)); + return gen; +} \ No newline at end of file diff --git a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini index 4d2931f03..9a8dc5168 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini @@ -1,8 +1,5 @@ [GeneratorExternal] -fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C -funcName = GeneratorCocktailStarlightMidy_PbPb5TeV() -[TriggerExternal] -fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/trigger/selectParticlesInAcceptance.C -funcName = selectMotherPartInAcc(-1.5,1.5) +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +funcName = GeneratorPhotoproduction_Midy(2, 0, -1.5, 1.5) [GeneratorPythia8] -config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg From 44b3ab3c6fd7cb333cbc1171d88e87e8926b341e Mon Sep 17 00:00:00 2001 From: ypwangg Date: Tue, 1 Sep 2026 11:56:29 +0200 Subject: [PATCH 06/15] fix bug in generator --- .../generator/generator_pythia8_StarlightTriggered_withGap.C | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C index 08a0ab760..0f719f653 100644 --- a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +++ b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C @@ -59,7 +59,9 @@ protected: bool found = false; while (!found) { mGeneratorParam->generateEvent(); + mGeneratorParam->importParticles(); found = findSignalInAcceptance(); + mGeneratorParam->clearParticles(); } } notifySubGenerator(1); @@ -82,6 +84,7 @@ protected: if ((mGeneratedEvents-1) % mInverseTriggerRatio == 0){ // add injected prompt signals to the stack mGeneratorParam->importParticles(); int originalSize = mParticles.size(); + std::cout<<"adding "<getParticles().size()<<" particles to the stack"<getParticles().size(); ipart++){ TParticle part = TParticle(mGeneratorParam->getParticles().at(ipart)); if(part.GetFirstMother() >= 0) part.SetFirstMother(part.GetFirstMother() + originalSize); From d7a7eb593024686039261113750f835d100c5f78 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Tue, 8 Sep 2026 17:49:51 +0800 Subject: [PATCH 07/15] add more process and inject signals based on cent --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 88 ++++++++++++--- ...rator_pythia8_StarlightTriggered_withGap.C | 106 ++++++++++++------ ...InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini | 5 + ...InjectedCoherentCharmoniaMidy_PbPb5TeV.ini | 5 + ...jectedIncoherentCharmoniaFwdy_PbPb5TeV.ini | 5 + ...jectedIncoherentCharmoniaMidy_PbPb5TeV.ini | 5 + ...ctedPhotoproucedCharmoniaMidy_PbPb5TeV.ini | 2 +- .../pythia8/decayer/jpsiPsi2Sdielectron.cfg | 9 ++ 8 files changed, 173 insertions(+), 52 deletions(-) create mode 100644 MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini create mode 100644 MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini create mode 100644 MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini create mode 100644 MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini create mode 100644 MC/config/PWGDQ/pythia8/decayer/jpsiPsi2Sdielectron.cfg diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 1463c9fb9..9b255c785 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -20,7 +20,27 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi generator->selectConfiguration(configuration); generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); generator->setExtraParams(extraParams); - generator->setupDpmjet(dpmjetconf); + // generator->setupDpmjet(dpmjetconf); + return generator; +} +o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, + float energyCM, + int beam1Z, + int beam1A, + int beam2Z, + int beam2A, + std::string extraParams = "", + std::string dpmjetconf = "") +{ + auto generator = makeStarlightGenerator(configuration, energyCM, beam1Z, beam1A, beam2Z, beam2A, extraParams, dpmjetconf); + generator->SetPolarization(1); //Transversal + generator->SetSizePdg(2); + generator->AddPdg(443,0); + generator->AddPdg(100443,1); + TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); + if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data())); + else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data())); + else if (configuration.find("JpsiToElRad") != std::string::npos) gen->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); return generator; } } // namespace @@ -28,26 +48,64 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); - auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); - auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); + + return genCocktailEvtGen; +} + +FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") +{ + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genCohJpsi, 1); + auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); + + return genCocktailEvtGen; +} + +FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") +{ + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); + + return genCocktailEvtGen; +} + +FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") +{ + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genCohJpsi, 1); + auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); + + return genCocktailEvtGen; +} + +FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") +{ + auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); - TString pdgs = "443;100443"; - std::string spdg; - TObjArray* obj = pdgs.Tokenize(";"); - genCocktailEvtGen->SetSizePdg(obj->GetEntriesFast()); - for (int i = 0; i < obj->GetEntriesFast(); i++) { - spdg = obj->At(i)->GetName(); - genCocktailEvtGen->AddPdg(std::stoi(spdg), i); - printf("PDG %d \n", std::stoi(spdg)); - } - genCocktailEvtGen->SetForceDecay(kEvtPsiPrimeJpsiDiElectron); return genCocktailEvtGen; } \ No newline at end of file diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C index 0f719f653..42aa445dd 100644 --- a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +++ b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C @@ -1,9 +1,13 @@ #include "FairGenerator.h" #include "Generators/GeneratorPythia8.h" +#include "Pythia8/HeavyIons.h" #include "Pythia8/Pythia.h" #include "TRandom.h" #include "GeneratorCocktailStarlight_PbPb5TeV.C" +#include +#include #include +#include using namespace o2::eventgen; using namespace Pythia8; @@ -24,10 +28,23 @@ public: GeneratorPythia8StarlightTriggeredWithGap(int inputTriggerRatio = 5, int gentype = 0) { mGeneratedEvents = 0; mInverseTriggerRatio = inputTriggerRatio; + mNumSignals = 0; switch (gentype) { - case 0: // generate prompt charmonia cocktail at mid rapidity at 5TeV + case 0: // generate photoproduced charmonia cocktail at mid rapidity at 5TeV mGeneratorParam = (Generator*)GeneratorCocktailStarlightMidy_PbPb5TeV(); break; + case 1: // generate coherent charmonia cocktail at mid rapidity at 5TeV + mGeneratorParam = (Generator*)GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(); + break; + case 2: // generate incoherent charmonia cocktail at mid rapidity at 5TeV + mGeneratorParam = (Generator*)GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(); + break; + case 3: // generate coherent charmonia cocktail at forward rapidity at 5TeV + mGeneratorParam = (Generator*)GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(); + break; + case 4: // generate incoherent charmonia cocktail at forward rapidity at 5TeV + mGeneratorParam = (Generator*)GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(); + break; } mGeneratorParam->Init(); @@ -50,21 +67,22 @@ protected: Bool_t generateEvent() override { // GeneratorPythia8::generateEvent(); + mNumSignals = 0; bool genOk = false; if (mGeneratedEvents % mInverseTriggerRatio == 0){ // add injected prompt signals to the stack - // bool found = false; std::cout<<"generating event with injected signals"<generateEvent(); - mGeneratorParam->importParticles(); - found = findSignalInAcceptance(); - mGeneratorParam->clearParticles(); - } } - notifySubGenerator(1); + double impactParameter = -1.; + if (mPythia.info.hiInfo) { + impactParameter = mPythia.info.hiInfo->b(); + mNumSignals = getNumSignalsForImpactParameter(impactParameter); + } else { + std::cout<<"no heavy-ion info available; embedding no signal events"< 0 ? 1 : 0); } else { // gap event while (!genOk) { genOk = GeneratorPythia8::generateEvent(); @@ -80,20 +98,24 @@ protected: { GeneratorPythia8::importParticles(); - bool genOk = false; if ((mGeneratedEvents-1) % mInverseTriggerRatio == 0){ // add injected prompt signals to the stack - mGeneratorParam->importParticles(); - int originalSize = mParticles.size(); - std::cout<<"adding "<getParticles().size()<<" particles to the stack"<getParticles().size(); ipart++){ - TParticle part = TParticle(mGeneratorParam->getParticles().at(ipart)); - if(part.GetFirstMother() >= 0) part.SetFirstMother(part.GetFirstMother() + originalSize); - if(part.GetFirstDaughter() >= 0) part.SetFirstDaughter(part.GetFirstDaughter() + originalSize); - if(part.GetLastDaughter() >= 0) part.SetLastDaughter(part.GetLastDaughter() + originalSize); - mParticles.push_back(part); - // encodeParticleStatusAndTracking method already called in GeneratorEvtGen.C - } - mGeneratorParam->clearParticles(); + for (int isig = 0; isig < mNumSignals; isig++) { + bool found = false; + while (!found) { + if (!mGeneratorParam->generateEvent()) { + continue; + } + if (!mGeneratorParam->importParticles()) { + mGeneratorParam->clearParticles(); + continue; + } + found = findSignalInAcceptance(); + if (found) { + appendCurrentSignalParticles(isig); + } + mGeneratorParam->clearParticles(); + } + } } return true; @@ -117,24 +139,36 @@ protected: } } } - // if (std::find(mSignalsPDGs.begin(), mSignalsPDGs.end(), part.GetPdgCode()) != mSignalsPDGs.end()) { - // std::cout<<"found signal with pdg: "< mHadronRapidityMax) { - // return false; - // } - // } - // } } std::cout<<"generated signal in acceptance"<(std::lround(5.0 + 0.886202881 * std::pow(std::max(0.0, 17.5 - impactParameter), 1.7)))); + } + + void appendCurrentSignalParticles(int signalIndex) + { + int originalSize = mParticles.size(); + std::cout<<"adding "<getParticles().size()<<" particles from signal event "<getParticles().size(); ipart++){ + TParticle part = TParticle(mGeneratorParam->getParticles().at(ipart)); + if(part.GetFirstMother() >= 0) part.SetFirstMother(part.GetFirstMother() + originalSize); + if(part.GetSecondMother() >= 0) part.SetLastMother(part.GetSecondMother() + originalSize); + if(part.GetFirstDaughter() >= 0) part.SetFirstDaughter(part.GetFirstDaughter() + originalSize); + if(part.GetLastDaughter() >= 0) part.SetLastDaughter(part.GetLastDaughter() + originalSize); + mParticles.push_back(part); + // encodeParticleStatusAndTracking method already called in GeneratorEvtGen.C + } + } + private: - Generator* mGeneratorParam; - unsigned long long mGeneratedEvents; - int mInverseTriggerRatio; + Generator* mGeneratorParam = nullptr; + unsigned long long mGeneratedEvents = 0; + int mInverseTriggerRatio = 1; + int mNumSignals = 0; // Pythia8::Pythia pythiaMBgen; // minimum bias event std::vector mSignalsPDGs; double mHadronRapidityMin; @@ -144,7 +178,7 @@ private: } FairGenerator* - GeneratorPhotoproduction_Midy(int triggerGap, int gentype = 0, double rapidityMin = -1.5, double rapidityMax = 1.5) + GeneratorPhotoproduction(int triggerGap, int gentype = 0, double rapidityMin = -1.5, double rapidityMax = 1.5) { auto gen = new o2::eventgen::GeneratorPythia8StarlightTriggeredWithGap(triggerGap, gentype); gen->setRapidityRange(rapidityMin, rapidityMax); diff --git a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini new file mode 100644 index 000000000..c69e9f661 --- /dev/null +++ b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini @@ -0,0 +1,5 @@ +[GeneratorExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +funcName = GeneratorPhotoproduction(2, 3, 2.0, 4.5) +[GeneratorPythia8] +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini new file mode 100644 index 000000000..939a7327e --- /dev/null +++ b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini @@ -0,0 +1,5 @@ +[GeneratorExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +funcName = GeneratorPhotoproduction(2, 1, -1.5, 1.5) +[GeneratorPythia8] +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini new file mode 100644 index 000000000..5024d65e9 --- /dev/null +++ b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini @@ -0,0 +1,5 @@ +[GeneratorExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +funcName = GeneratorPhotoproduction(2, 4, 2.0, 4.5) +[GeneratorPythia8] +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini new file mode 100644 index 000000000..e7f4adb39 --- /dev/null +++ b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini @@ -0,0 +1,5 @@ +[GeneratorExternal] +fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +funcName = GeneratorPhotoproduction(2, 2, -1.5, 1.5) +[GeneratorPythia8] +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini index 9a8dc5168..5a6f58e5c 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini @@ -1,5 +1,5 @@ [GeneratorExternal] fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C -funcName = GeneratorPhotoproduction_Midy(2, 0, -1.5, 1.5) +funcName = GeneratorPhotoproduction(2, 0, -1.5, 1.5) [GeneratorPythia8] config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg diff --git a/MC/config/PWGDQ/pythia8/decayer/jpsiPsi2Sdielectron.cfg b/MC/config/PWGDQ/pythia8/decayer/jpsiPsi2Sdielectron.cfg new file mode 100644 index 000000000..145dc8cec --- /dev/null +++ b/MC/config/PWGDQ/pythia8/decayer/jpsiPsi2Sdielectron.cfg @@ -0,0 +1,9 @@ +### Force J/psi and psi(2S) -> e+ e- + +### J/psi -> e+ e- +443:onMode = off # switch off all decay channels +443:onIfAll = 11 -11 # switch on e+ e- decay channel + +### psi(2S) -> e+ e- +100443:onMode = off # switch off all decay channels +100443:onIfAll = 11 -11 # switch on e+ e- decay channel From e850411d68aba099205be87633f53c343ec7e104 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Tue, 8 Sep 2026 20:20:50 +0800 Subject: [PATCH 08/15] fix bug --- .../external/generator/GeneratorCocktailStarlight_PbPb5TeV.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 9b255c785..9cc44c4d7 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -40,7 +40,7 @@ o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string config TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data())); else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data())); - else if (configuration.find("JpsiToElRad") != std::string::npos) gen->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); + else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); return generator; } } // namespace From c97b94a6ed595e12a62ee0fe2ec6b8cae1a1acad Mon Sep 17 00:00:00 2001 From: ypwangg Date: Thu, 10 Sep 2026 15:20:22 +0800 Subject: [PATCH 09/15] fix bug --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 9cc44c4d7..aeb70a794 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -23,16 +23,20 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi // generator->setupDpmjet(dpmjetconf); return generator; } -o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, - float energyCM, - int beam1Z, - int beam1A, - int beam2Z, - int beam2A, - std::string extraParams = "", - std::string dpmjetconf = "") +o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, + float energyCM, + int beam1Z, + int beam1A, + int beam2Z, + int beam2A, + std::string extraParams = "", + std::string dpmjetconf = "") { - auto generator = makeStarlightGenerator(configuration, energyCM, beam1Z, beam1A, beam2Z, beam2A, extraParams, dpmjetconf); + auto generator = new o2::eventgen::GeneratorEvtGen(); + generator->selectConfiguration(configuration); + generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); + generator->setExtraParams(extraParams); + // generator->setupDpmjet(dpmjetconf); generator->SetPolarization(1); //Transversal generator->SetSizePdg(2); generator->AddPdg(443,0); @@ -108,4 +112,4 @@ FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; -} \ No newline at end of file +} From d1293a0ebe31a6901b6c56f70e12975784d3c3e6 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Wed, 16 Sep 2026 17:15:29 +0800 Subject: [PATCH 10/15] add test file and update centrality cut --- ...rator_pythia8_StarlightTriggered_withGap.C | 6 + ...r_InjectedCoherentCharmoniaFwdy_PbPb5TeV.C | 104 ++++++++++++++++++ ...r_InjectedCoherentCharmoniaMidy_PbPb5TeV.C | 104 ++++++++++++++++++ ...InjectedIncoherentCharmoniaFwdy_PbPb5TeV.C | 104 ++++++++++++++++++ ...InjectedIncoherentCharmoniaMidy_PbPb5TeV.C | 104 ++++++++++++++++++ 5 files changed, 422 insertions(+) create mode 100644 MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.C create mode 100644 MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.C create mode 100644 MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.C create mode 100644 MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.C diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C index 42aa445dd..507c3cb00 100644 --- a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +++ b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C @@ -146,6 +146,12 @@ protected: int getNumSignalsForImpactParameter(double impactParameter) const { + const double photoproductionImpactParameterCut = 4.0; // tmp cut to embed signal > 10% centrality + if (impactParameter < photoproductionImpactParameterCut) { + std::cout<<"impact parameter: "<(std::lround(5.0 + 0.886202881 * std::pow(std::max(0.0, 17.5 - impactParameter), 1.7)))); } diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.C new file mode 100644 index 000000000..76c29ef3d --- /dev/null +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.C @@ -0,0 +1,104 @@ +int External() { + std::string path{"o2sim_Kine.root"}; + TFile file(path.c_str(), "READ"); + if (file.IsZombie()) { + std::cerr << "Cannot open ROOT file " << path << "\n"; + return 1; + } + auto tree = (TTree *)file.Get("o2sim"); + if (!tree) + { + std::cerr << "Cannot find tree o2sim in file " << path << "\n"; + return 1; + } + std::vector* tracks{}; + tree->SetBranchAddress("MCTrack", &tracks); + + int checkPdgSignal[2] = {443, 100443}; + int checkPdgDecay = 11; + double rapiditymin = 2.0; double rapiditymax = 4.5; + + int nLeptons{}; + int nAntileptons{}; + int nLeptonPairs{}; + int nPrimaryLepton{}; + int nPrimaryAntilepton{}; + int nLeptonPairsToBeDone{}; + int nSignalJpsi{}; + int nSignalPsi2S{}; + int nPions{}; + int nPhotonsFromPsi{}; + int nPhotonsFromJPsi{}; + int nSignalJpsiWithinAcc{}; + int nSignalPsi2SWithinAcc{}; + + auto nEvents = tree->GetEntries(); + for (int i = 0; i < nEvents; i++) { + tree->GetEntry(i); + for (auto& track : *tracks) { + auto pdg = track.GetPdgCode(); + auto rapidity = track.GetRapidity(); + auto idMoth = track.getMotherTrackId(); + if (pdg == checkPdgDecay) { + // count leptons + nLeptons++; + if (idMoth == -1) nPrimaryLepton++; + } else if (pdg == -checkPdgDecay) { + // count anti-leptons + nAntileptons++; + if (idMoth == -1) nPrimaryAntilepton++; + } else if (pdg == checkPdgSignal[0] || pdg == checkPdgSignal[1]) { + if (idMoth < 0) { + // count signal PDG + pdg == checkPdgSignal[0] ? nSignalJpsi++ : nSignalPsi2S++; + // count signal PDG within acceptance + if (rapidity > rapiditymin && rapidity < rapiditymax) { + pdg == checkPdgSignal[0] ? nSignalJpsiWithinAcc++ : nSignalPsi2SWithinAcc++; + } + } + int child0Id = track.getFirstDaughterTrackId(); + int child1Id = track.getLastDaughterTrackId(); + for (int iDaugh = child0Id; iDaugh <= child1Id; iDaugh++) { + auto daugh = tracks->at(iDaugh); + if (daugh.GetPdgCode() == 22) { + if (pdg == checkPdgSignal[0]) { + nPhotonsFromJPsi++; + } else if (pdg == checkPdgSignal[1]) { + nPhotonsFromPsi++; + } + } + if (TMath::Abs(daugh.GetPdgCode()) == 211) nPions++; + } + auto child0 = o2::mcutils::MCTrackNavigator::getDaughter0(track, *tracks); + auto child1 = o2::mcutils::MCTrackNavigator::getDaughter1(track, *tracks); + if (child0 != nullptr && child1 != nullptr) { + // check for parent-child relations + auto pdg0 = child0->GetPdgCode(); + auto pdg1 = child1->GetPdgCode(); + // std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[0]) std::cout << "First and last children of parent Jpsi are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[1]) std::cout << "First and last children of parent Psi(2S) are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { + nLeptonPairs++; + if (child0->getToBeDone() && child1->getToBeDone()) { + nLeptonPairsToBeDone++; + } + } + } + } + } + } + + std::cout << "#events: " << nEvents << "\n" + << "#leptons: " << nLeptons << "\n" + << "#antileptons: " << nAntileptons << "\n" + << "#primary leptons: " << nPrimaryLepton << "\n" + << "#primary antileptons: " << nPrimaryAntilepton << "\n" + << "#signal (prompt Jpsi): " << nSignalJpsi << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalJpsiWithinAcc << "\n" + << "#signal (prompt Psi(2S)): " << nSignalPsi2S << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalPsi2SWithinAcc << "\n" + << "#photons from Jpsi: " << nPhotonsFromJPsi <<" #photons from Psi(2S): "<< nPhotonsFromPsi<<"\n" + << "#pions from Psi(2S): "<< nPions<<"\n" + << "#lepton pairs: " << nLeptonPairs <<" #lepton pairs to be done: "<< nLeptonPairsToBeDone<<"\n"; + + return 0; +} diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.C new file mode 100644 index 000000000..d9c8833d1 --- /dev/null +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.C @@ -0,0 +1,104 @@ +int External() { + std::string path{"o2sim_Kine.root"}; + TFile file(path.c_str(), "READ"); + if (file.IsZombie()) { + std::cerr << "Cannot open ROOT file " << path << "\n"; + return 1; + } + auto tree = (TTree *)file.Get("o2sim"); + if (!tree) + { + std::cerr << "Cannot find tree o2sim in file " << path << "\n"; + return 1; + } + std::vector* tracks{}; + tree->SetBranchAddress("MCTrack", &tracks); + + int checkPdgSignal[2] = {443, 100443}; + int checkPdgDecay = 11; + double rapiditymin = -1.5; double rapiditymax = 1.5; + + int nLeptons{}; + int nAntileptons{}; + int nLeptonPairs{}; + int nPrimaryLepton{}; + int nPrimaryAntilepton{}; + int nLeptonPairsToBeDone{}; + int nSignalJpsi{}; + int nSignalPsi2S{}; + int nPions{}; + int nPhotonsFromPsi{}; + int nPhotonsFromJPsi{}; + int nSignalJpsiWithinAcc{}; + int nSignalPsi2SWithinAcc{}; + + auto nEvents = tree->GetEntries(); + for (int i = 0; i < nEvents; i++) { + tree->GetEntry(i); + for (auto& track : *tracks) { + auto pdg = track.GetPdgCode(); + auto rapidity = track.GetRapidity(); + auto idMoth = track.getMotherTrackId(); + if (pdg == checkPdgDecay) { + // count leptons + nLeptons++; + if (idMoth == -1) nPrimaryLepton++; + } else if (pdg == -checkPdgDecay) { + // count anti-leptons + nAntileptons++; + if (idMoth == -1) nPrimaryAntilepton++; + } else if (pdg == checkPdgSignal[0] || pdg == checkPdgSignal[1]) { + if (idMoth < 0) { + // count signal PDG + pdg == checkPdgSignal[0] ? nSignalJpsi++ : nSignalPsi2S++; + // count signal PDG within acceptance + if (rapidity > rapiditymin && rapidity < rapiditymax) { + pdg == checkPdgSignal[0] ? nSignalJpsiWithinAcc++ : nSignalPsi2SWithinAcc++; + } + } + int child0Id = track.getFirstDaughterTrackId(); + int child1Id = track.getLastDaughterTrackId(); + for (int iDaugh = child0Id; iDaugh <= child1Id; iDaugh++) { + auto daugh = tracks->at(iDaugh); + if (daugh.GetPdgCode() == 22) { + if (pdg == checkPdgSignal[0]) { + nPhotonsFromJPsi++; + } else if (pdg == checkPdgSignal[1]) { + nPhotonsFromPsi++; + } + } + if (TMath::Abs(daugh.GetPdgCode()) == 211) nPions++; + } + auto child0 = o2::mcutils::MCTrackNavigator::getDaughter0(track, *tracks); + auto child1 = o2::mcutils::MCTrackNavigator::getDaughter1(track, *tracks); + if (child0 != nullptr && child1 != nullptr) { + // check for parent-child relations + auto pdg0 = child0->GetPdgCode(); + auto pdg1 = child1->GetPdgCode(); + // std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[0]) std::cout << "First and last children of parent Jpsi are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[1]) std::cout << "First and last children of parent Psi(2S) are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { + nLeptonPairs++; + if (child0->getToBeDone() && child1->getToBeDone()) { + nLeptonPairsToBeDone++; + } + } + } + } + } + } + + std::cout << "#events: " << nEvents << "\n" + << "#leptons: " << nLeptons << "\n" + << "#antileptons: " << nAntileptons << "\n" + << "#primary leptons: " << nPrimaryLepton << "\n" + << "#primary antileptons: " << nPrimaryAntilepton << "\n" + << "#signal (prompt Jpsi): " << nSignalJpsi << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalJpsiWithinAcc << "\n" + << "#signal (prompt Psi(2S)): " << nSignalPsi2S << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalPsi2SWithinAcc << "\n" + << "#photons from Jpsi: " << nPhotonsFromJPsi <<" #photons from Psi(2S): "<< nPhotonsFromPsi<<"\n" + << "#pions from Psi(2S): "<< nPions<<"\n" + << "#lepton pairs: " << nLeptonPairs <<" #lepton pairs to be done: "<< nLeptonPairsToBeDone<<"\n"; + + return 0; +} diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.C new file mode 100644 index 000000000..76c29ef3d --- /dev/null +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.C @@ -0,0 +1,104 @@ +int External() { + std::string path{"o2sim_Kine.root"}; + TFile file(path.c_str(), "READ"); + if (file.IsZombie()) { + std::cerr << "Cannot open ROOT file " << path << "\n"; + return 1; + } + auto tree = (TTree *)file.Get("o2sim"); + if (!tree) + { + std::cerr << "Cannot find tree o2sim in file " << path << "\n"; + return 1; + } + std::vector* tracks{}; + tree->SetBranchAddress("MCTrack", &tracks); + + int checkPdgSignal[2] = {443, 100443}; + int checkPdgDecay = 11; + double rapiditymin = 2.0; double rapiditymax = 4.5; + + int nLeptons{}; + int nAntileptons{}; + int nLeptonPairs{}; + int nPrimaryLepton{}; + int nPrimaryAntilepton{}; + int nLeptonPairsToBeDone{}; + int nSignalJpsi{}; + int nSignalPsi2S{}; + int nPions{}; + int nPhotonsFromPsi{}; + int nPhotonsFromJPsi{}; + int nSignalJpsiWithinAcc{}; + int nSignalPsi2SWithinAcc{}; + + auto nEvents = tree->GetEntries(); + for (int i = 0; i < nEvents; i++) { + tree->GetEntry(i); + for (auto& track : *tracks) { + auto pdg = track.GetPdgCode(); + auto rapidity = track.GetRapidity(); + auto idMoth = track.getMotherTrackId(); + if (pdg == checkPdgDecay) { + // count leptons + nLeptons++; + if (idMoth == -1) nPrimaryLepton++; + } else if (pdg == -checkPdgDecay) { + // count anti-leptons + nAntileptons++; + if (idMoth == -1) nPrimaryAntilepton++; + } else if (pdg == checkPdgSignal[0] || pdg == checkPdgSignal[1]) { + if (idMoth < 0) { + // count signal PDG + pdg == checkPdgSignal[0] ? nSignalJpsi++ : nSignalPsi2S++; + // count signal PDG within acceptance + if (rapidity > rapiditymin && rapidity < rapiditymax) { + pdg == checkPdgSignal[0] ? nSignalJpsiWithinAcc++ : nSignalPsi2SWithinAcc++; + } + } + int child0Id = track.getFirstDaughterTrackId(); + int child1Id = track.getLastDaughterTrackId(); + for (int iDaugh = child0Id; iDaugh <= child1Id; iDaugh++) { + auto daugh = tracks->at(iDaugh); + if (daugh.GetPdgCode() == 22) { + if (pdg == checkPdgSignal[0]) { + nPhotonsFromJPsi++; + } else if (pdg == checkPdgSignal[1]) { + nPhotonsFromPsi++; + } + } + if (TMath::Abs(daugh.GetPdgCode()) == 211) nPions++; + } + auto child0 = o2::mcutils::MCTrackNavigator::getDaughter0(track, *tracks); + auto child1 = o2::mcutils::MCTrackNavigator::getDaughter1(track, *tracks); + if (child0 != nullptr && child1 != nullptr) { + // check for parent-child relations + auto pdg0 = child0->GetPdgCode(); + auto pdg1 = child1->GetPdgCode(); + // std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[0]) std::cout << "First and last children of parent Jpsi are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[1]) std::cout << "First and last children of parent Psi(2S) are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { + nLeptonPairs++; + if (child0->getToBeDone() && child1->getToBeDone()) { + nLeptonPairsToBeDone++; + } + } + } + } + } + } + + std::cout << "#events: " << nEvents << "\n" + << "#leptons: " << nLeptons << "\n" + << "#antileptons: " << nAntileptons << "\n" + << "#primary leptons: " << nPrimaryLepton << "\n" + << "#primary antileptons: " << nPrimaryAntilepton << "\n" + << "#signal (prompt Jpsi): " << nSignalJpsi << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalJpsiWithinAcc << "\n" + << "#signal (prompt Psi(2S)): " << nSignalPsi2S << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalPsi2SWithinAcc << "\n" + << "#photons from Jpsi: " << nPhotonsFromJPsi <<" #photons from Psi(2S): "<< nPhotonsFromPsi<<"\n" + << "#pions from Psi(2S): "<< nPions<<"\n" + << "#lepton pairs: " << nLeptonPairs <<" #lepton pairs to be done: "<< nLeptonPairsToBeDone<<"\n"; + + return 0; +} diff --git a/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.C b/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.C new file mode 100644 index 000000000..d9c8833d1 --- /dev/null +++ b/MC/config/PWGDQ/ini/tests/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.C @@ -0,0 +1,104 @@ +int External() { + std::string path{"o2sim_Kine.root"}; + TFile file(path.c_str(), "READ"); + if (file.IsZombie()) { + std::cerr << "Cannot open ROOT file " << path << "\n"; + return 1; + } + auto tree = (TTree *)file.Get("o2sim"); + if (!tree) + { + std::cerr << "Cannot find tree o2sim in file " << path << "\n"; + return 1; + } + std::vector* tracks{}; + tree->SetBranchAddress("MCTrack", &tracks); + + int checkPdgSignal[2] = {443, 100443}; + int checkPdgDecay = 11; + double rapiditymin = -1.5; double rapiditymax = 1.5; + + int nLeptons{}; + int nAntileptons{}; + int nLeptonPairs{}; + int nPrimaryLepton{}; + int nPrimaryAntilepton{}; + int nLeptonPairsToBeDone{}; + int nSignalJpsi{}; + int nSignalPsi2S{}; + int nPions{}; + int nPhotonsFromPsi{}; + int nPhotonsFromJPsi{}; + int nSignalJpsiWithinAcc{}; + int nSignalPsi2SWithinAcc{}; + + auto nEvents = tree->GetEntries(); + for (int i = 0; i < nEvents; i++) { + tree->GetEntry(i); + for (auto& track : *tracks) { + auto pdg = track.GetPdgCode(); + auto rapidity = track.GetRapidity(); + auto idMoth = track.getMotherTrackId(); + if (pdg == checkPdgDecay) { + // count leptons + nLeptons++; + if (idMoth == -1) nPrimaryLepton++; + } else if (pdg == -checkPdgDecay) { + // count anti-leptons + nAntileptons++; + if (idMoth == -1) nPrimaryAntilepton++; + } else if (pdg == checkPdgSignal[0] || pdg == checkPdgSignal[1]) { + if (idMoth < 0) { + // count signal PDG + pdg == checkPdgSignal[0] ? nSignalJpsi++ : nSignalPsi2S++; + // count signal PDG within acceptance + if (rapidity > rapiditymin && rapidity < rapiditymax) { + pdg == checkPdgSignal[0] ? nSignalJpsiWithinAcc++ : nSignalPsi2SWithinAcc++; + } + } + int child0Id = track.getFirstDaughterTrackId(); + int child1Id = track.getLastDaughterTrackId(); + for (int iDaugh = child0Id; iDaugh <= child1Id; iDaugh++) { + auto daugh = tracks->at(iDaugh); + if (daugh.GetPdgCode() == 22) { + if (pdg == checkPdgSignal[0]) { + nPhotonsFromJPsi++; + } else if (pdg == checkPdgSignal[1]) { + nPhotonsFromPsi++; + } + } + if (TMath::Abs(daugh.GetPdgCode()) == 211) nPions++; + } + auto child0 = o2::mcutils::MCTrackNavigator::getDaughter0(track, *tracks); + auto child1 = o2::mcutils::MCTrackNavigator::getDaughter1(track, *tracks); + if (child0 != nullptr && child1 != nullptr) { + // check for parent-child relations + auto pdg0 = child0->GetPdgCode(); + auto pdg1 = child1->GetPdgCode(); + // std::cout << "First and last children of parent " << checkPdgSignal << " are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[0]) std::cout << "First and last children of parent Jpsi are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (pdg == checkPdgSignal[1]) std::cout << "First and last children of parent Psi(2S) are PDG0: " << pdg0 << " PDG1: " << pdg1 << "\n"; + if (std::abs(pdg0) == checkPdgDecay && std::abs(pdg1) == checkPdgDecay && pdg0 == -pdg1) { + nLeptonPairs++; + if (child0->getToBeDone() && child1->getToBeDone()) { + nLeptonPairsToBeDone++; + } + } + } + } + } + } + + std::cout << "#events: " << nEvents << "\n" + << "#leptons: " << nLeptons << "\n" + << "#antileptons: " << nAntileptons << "\n" + << "#primary leptons: " << nPrimaryLepton << "\n" + << "#primary antileptons: " << nPrimaryAntilepton << "\n" + << "#signal (prompt Jpsi): " << nSignalJpsi << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalJpsiWithinAcc << "\n" + << "#signal (prompt Psi(2S)): " << nSignalPsi2S << "; within acceptance " << rapiditymin << " < y < " << rapiditymax << " : " << nSignalPsi2SWithinAcc << "\n" + << "#photons from Jpsi: " << nPhotonsFromJPsi <<" #photons from Psi(2S): "<< nPhotonsFromPsi<<"\n" + << "#pions from Psi(2S): "<< nPions<<"\n" + << "#lepton pairs: " << nLeptonPairs <<" #lepton pairs to be done: "<< nLeptonPairsToBeDone<<"\n"; + + return 0; +} From c25581e4ef0931034d1e7bc26c18343ab89323db Mon Sep 17 00:00:00 2001 From: ypwangg Date: Thu, 17 Sep 2026 11:39:00 +0800 Subject: [PATCH 11/15] update b --- .../generator/generator_pythia8_StarlightTriggered_withGap.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C index 507c3cb00..7164e1cfe 100644 --- a/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C +++ b/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C @@ -146,7 +146,7 @@ protected: int getNumSignalsForImpactParameter(double impactParameter) const { - const double photoproductionImpactParameterCut = 4.0; // tmp cut to embed signal > 10% centrality + const double photoproductionImpactParameterCut = 3.5; // tmp cut to embed signal > 10% centrality if (impactParameter < photoproductionImpactParameterCut) { std::cout<<"impact parameter: "< Date: Thu, 17 Sep 2026 20:44:54 +0800 Subject: [PATCH 12/15] fix bug in generator --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index aeb70a794..32bb5d87f 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -23,44 +23,36 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi // generator->setupDpmjet(dpmjetconf); return generator; } -o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, - float energyCM, - int beam1Z, - int beam1A, - int beam2Z, - int beam2A, - std::string extraParams = "", - std::string dpmjetconf = "") +void configureEvtGen(o2::eventgen::GeneratorEvtGen* generator, bool midrapidity) { - auto generator = new o2::eventgen::GeneratorEvtGen(); - generator->selectConfiguration(configuration); - generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); - generator->setExtraParams(extraParams); - // generator->setupDpmjet(dpmjetconf); - generator->SetPolarization(1); //Transversal - generator->SetSizePdg(2); - generator->AddPdg(443,0); - generator->AddPdg(100443,1); + generator->SetPolarization(1); // Transverse TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); - if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data())); - else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data())); - else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); - return generator; + if (midrapidity) { + generator->SetSizePdg(2); + generator->AddPdg(443, 0); + generator->AddPdg(100443, 1); + generator->SetDecayTable(Form("%s/JPSI_PSI2S.EEPIPI.DEC", pathO2.Data())); + } else { + generator->SetSizePdg(1); + generator->AddPdg(100443, 0); + generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC", pathO2.Data())); + } } } // namespace FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); - auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -69,11 +61,12 @@ FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, in FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -82,9 +75,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -93,11 +87,12 @@ FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + configureEvtGen(genCocktailEvtGen, false); auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -106,9 +101,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + configureEvtGen(genCocktailEvtGen, false); auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; From 0359c3693c15266771912035d0216386c90c9d8c Mon Sep 17 00:00:00 2001 From: ypwangg Date: Fri, 18 Sep 2026 11:39:40 +0800 Subject: [PATCH 13/15] fix bug --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 32bb5d87f..35ad7be06 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -23,36 +23,40 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi // generator->setupDpmjet(dpmjetconf); return generator; } -void configureEvtGen(o2::eventgen::GeneratorEvtGen* generator, bool midrapidity) +o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, + float energyCM, + int beam1Z, + int beam1A, + int beam2Z, + int beam2A, + std::string extraParams = "", + std::string dpmjetconf = "") { - generator->SetPolarization(1); // Transverse - TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); - if (midrapidity) { + auto generator = makeStarlightGenerator(configuration, energyCM, beam1Z, beam1A, beam2Z, beam2A, extraParams, dpmjetconf); + generator->SetPolarization(1); //Transversal generator->SetSizePdg(2); - generator->AddPdg(443, 0); - generator->AddPdg(100443, 1); - generator->SetDecayTable(Form("%s/JPSI_PSI2S.EEPIPI.DEC", pathO2.Data())); - } else { - generator->SetSizePdg(1); - generator->AddPdg(100443, 0); - generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC", pathO2.Data())); - } + generator->AddPdg(443,0); + generator->AddPdg(100443,1); + TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); + if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data())); + else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data())); + else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); + return generator; } } // namespace FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - configureEvtGen(genCocktailEvtGen, true); - auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); - auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); - auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -61,12 +65,11 @@ FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, in FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - configureEvtGen(genCocktailEvtGen, true); - auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -75,10 +78,9 @@ FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - configureEvtGen(genCocktailEvtGen, true); - auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -87,12 +89,11 @@ FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - configureEvtGen(genCocktailEvtGen, false); auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -101,11 +102,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - configureEvtGen(genCocktailEvtGen, false); auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; -} +} \ No newline at end of file From 61346c39d67e151c357aa8b9eab1e37910c28049 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Sun, 20 Sep 2026 10:17:25 +0200 Subject: [PATCH 14/15] fix bug --- .../generator/GeneratorCocktailStarlight_PbPb5TeV.C | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 35ad7be06..280830794 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -32,9 +32,13 @@ o2::eventgen::GeneratorEvtGen* makeStarl std::string extraParams = "", std::string dpmjetconf = "") { - auto generator = makeStarlightGenerator(configuration, energyCM, beam1Z, beam1A, beam2Z, beam2A, extraParams, dpmjetconf); + auto generator = new o2::eventgen::GeneratorEvtGen(); + generator->selectConfiguration(configuration); + generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); + generator->setExtraParams(extraParams); + // generator->setupDpmjet(dpmjetconf); generator->SetPolarization(1); //Transversal - generator->SetSizePdg(2); + generator->SetSizePdg(2); generator->AddPdg(443,0); generator->AddPdg(100443,1); TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); From c705b56de8ac635ddbb9fa05dc026496625d7281 Mon Sep 17 00:00:00 2001 From: ypwangg Date: Sun, 20 Sep 2026 13:00:36 +0200 Subject: [PATCH 15/15] fix bug --- .../GeneratorCocktailStarlight_PbPb5TeV.C | 61 +++++++++---------- ...InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini | 2 +- ...InjectedCoherentCharmoniaMidy_PbPb5TeV.ini | 2 +- ...jectedIncoherentCharmoniaFwdy_PbPb5TeV.ini | 2 +- ...jectedIncoherentCharmoniaMidy_PbPb5TeV.ini | 2 +- ...ctedPhotoproucedCharmoniaMidy_PbPb5TeV.ini | 2 +- 6 files changed, 34 insertions(+), 37 deletions(-) diff --git a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C index 280830794..632f49e03 100644 --- a/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C +++ b/MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C @@ -23,44 +23,37 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi // generator->setupDpmjet(dpmjetconf); return generator; } -o2::eventgen::GeneratorEvtGen* makeStarlightToEvtGenGenerator(std::string configuration, - float energyCM, - int beam1Z, - int beam1A, - int beam2Z, - int beam2A, - std::string extraParams = "", - std::string dpmjetconf = "") +void configureEvtGen(o2::eventgen::GeneratorEvtGen* generator, bool midrapidity) { - auto generator = new o2::eventgen::GeneratorEvtGen(); - generator->selectConfiguration(configuration); - generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A); - generator->setExtraParams(extraParams); - // generator->setupDpmjet(dpmjetconf); - generator->SetPolarization(1); //Transversal - generator->SetSizePdg(2); - generator->AddPdg(443,0); - generator->AddPdg(100443,1); + generator->SetPolarization(1); // Transverse + if (midrapidity) { + generator->SetSizePdg(2); + generator->AddPdg(443, 0); + generator->AddPdg(100443, 1); + TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGDQ/EvtGen/DecayTablesEvtgen"); + generator->SetDecayTable(Form("%s/PSITOJPSIPIPI.DEC", pathO2.Data())); + } else { + generator->SetSizePdg(1); + generator->AddPdg(100443, 0); TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen"); - if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data())); - else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data())); - else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data())); - return generator; + generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC", pathO2.Data())); + } } } // namespace FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); - auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -69,11 +62,12 @@ FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, in FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -82,9 +76,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); - auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + configureEvtGen(genCocktailEvtGen, true); + auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; @@ -93,11 +88,12 @@ FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + configureEvtGen(genCocktailEvtGen, false); auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohJpsi, 1); auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1); - auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genCohPsi2S, 1); return genCocktailEvtGen; @@ -106,10 +102,11 @@ FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "") { auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen(); + configureEvtGen(genCocktailEvtGen, false); auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohJpsi, 1); - auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); + auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf); genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1); return genCocktailEvtGen; -} \ No newline at end of file +} diff --git a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini index c69e9f661..5b2ddf940 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaFwdy_PbPb5TeV.ini @@ -2,4 +2,4 @@ fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C funcName = GeneratorPhotoproduction(2, 3, 2.0, 4.5) [GeneratorPythia8] -config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini index 939a7327e..6393747f4 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedCoherentCharmoniaMidy_PbPb5TeV.ini @@ -2,4 +2,4 @@ fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C funcName = GeneratorPhotoproduction(2, 1, -1.5, 1.5) [GeneratorPythia8] -config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini index 5024d65e9..9f9100d45 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaFwdy_PbPb5TeV.ini @@ -2,4 +2,4 @@ fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C funcName = GeneratorPhotoproduction(2, 4, 2.0, 4.5) [GeneratorPythia8] -config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini index e7f4adb39..cf889af81 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedIncoherentCharmoniaMidy_PbPb5TeV.ini @@ -2,4 +2,4 @@ fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C funcName = GeneratorPhotoproduction(2, 2, -1.5, 1.5) [GeneratorPythia8] -config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg diff --git a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini index 5a6f58e5c..f49c6a994 100644 --- a/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini +++ b/MC/config/PWGDQ/ini/Generator_InjectedPhotoproucedCharmoniaMidy_PbPb5TeV.ini @@ -2,4 +2,4 @@ fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_StarlightTriggered_withGap.C funcName = GeneratorPhotoproduction(2, 0, -1.5, 1.5) [GeneratorPythia8] -config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_536tev.cfg +config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg