Skip to content

Commit 1cec0d5

Browse files
rmunzerrmunzer
authored
Merge branch 'AliceO2Group:master' into tpc_cmc
2 parents a8497a1 + 509e034 commit 1cec0d5

8 files changed

Lines changed: 204 additions & 8 deletions

File tree

‎MC/config/ALICE3/ini/pythia8_pp_rescattering_136tev.ini‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Diamond]
2+
width[2]=6.0
3+
4+
[GeneratorExternal]
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
6+
funcName=generator_pythia8_ALICE3()
7+
8+
[GeneratorPythia8]
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_rescattering_136tev.cfg

‎MC/config/ALICE3/ini/tests/pythia8_pp_rescattering_136tev.C‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
int External() {
2+
std::string path{"o2sim_Kine.root"};
3+
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
9+
10+
auto tree = (TTree *)file.Get("o2sim");
11+
if (!tree) {
12+
std::cerr << "Cannot find tree o2sim in file " << path << "\n";
13+
return 1;
14+
}
15+
std::vector<o2::MCTrack> *tracks{};
16+
tree->SetBranchAddress("MCTrack", &tracks);
17+
18+
auto nEvents = tree->GetEntries();
19+
if (nEvents == 0) {
20+
std::cerr << "No event of interest\n";
21+
return 1;
22+
}
23+
return 0;
24+
}

‎MC/config/ALICE3/pythia8/generator/pythia8_pp_rescattering_136tev.cfg‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
### Specify beams
2+
Beams:idA = 2212
3+
Beams:idB = 2212
4+
Beams:eCM = 13600. ### energy
5+
6+
Beams:frameType = 1
7+
ParticleDecays:limitTau0 = on
8+
ParticleDecays:tau0Max = 10. ### match alice: 1cm/c = 10.0mm/c
9+
10+
### processes
11+
SoftQCD:inelastic = on # all inelastic processes
12+
13+
# default: do nothing, Monash 2013 will do its thing
14+
Tune:pp = 14
15+
16+
### enable hadronic rescattering
17+
HadronLevel:Rescatter = on # default = off
18+
Fragmentation:setVertices = on # default = off
19+
PartonVertex:setVertex = on # default = off
20+
Rescattering:nearestNeighbours = off # default = on (but "require a larger retuning effort")
21+
Rescattering:inelastic = on # default = on
22+
23+
Random:setSeed = on

‎MC/config/PWGDQ/EvtGen/DecayTablesEvtgen/BTOPSIJPSITODIELECTRON.DEC‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ Decay B0
3838
0.000540000 J/psi K0 rho0 PHSP; #[New mode added] #[Reconstructed PDG2011]
3939
0.000800000 J/psi K*+ pi- PHSP; #[New mode added] #[Reconstructed PDG2011]
4040
0.000660000 J/psi K*0 pi+ pi- PHSP; #[New mode added] #[Reconstructed PDG2011]
41+
42+
# --- chi_c1 ---
43+
0.000011200 chi_c1 pi0 SVS;
44+
0.000395000 chi_c1 K0 SVS;
45+
0.000497000 chi_c1 K+ pi- PHSP;
46+
0.000320000 chi_c1 K0 pi+ pi- PHSP;
47+
0.000350000 chi_c1 K+ pi0 pi- PHSP;
48+
49+
# --- chi_c2 ---
50+
0.000015000 chi_c2 K0 SVS;
51+
0.000049000 chi_c2 K*0 SVV_HELAMP 1.0 0.0 0.0;
52+
0.000072000 chi_c2 K+ pi- PHSP;
53+
0.000174000 chi_c2 pi+ pi- K0 PHSP;
54+
0.000074000 chi_c2 pi- pi0 K+ PHSP;
4155
Enddecay
4256

4357
Decay anti-B0
@@ -78,6 +92,20 @@ Decay anti-B0
7892
0.000540000 J/psi anti-K0 rho0 PHSP; #[New mode added] #[Reconstructed PDG2011]
7993
0.000800000 J/psi K*- pi+ PHSP; #[New mode added] #[Reconstructed PDG2011]
8094
0.000660000 J/psi anti-K*0 pi- pi+ PHSP; #[New mode added] #[Reconstructed PDG2011]
95+
96+
# --- chi_c1 ---
97+
0.000011200 chi_c1 pi0 SVS;
98+
0.000395000 chi_c1 anti-K0 SVS;
99+
0.000497000 chi_c1 K- pi+ PHSP;
100+
0.000320000 chi_c1 anti-K0 pi- pi+ PHSP;
101+
0.000350000 chi_c1 K- pi0 pi+ PHSP;
102+
103+
# --- chi_c2 ---
104+
0.000015000 chi_c2 anti-K0 SVS;
105+
0.000049000 chi_c2 anti-K*0 SVV_HELAMP 1.0 0.0 0.0;
106+
0.000072000 chi_c2 K- pi+ PHSP;
107+
0.000174000 chi_c2 pi- pi+ anti-K0 PHSP;
108+
0.000074000 chi_c2 pi+ pi0 K- PHSP;
81109
Enddecay
82110

83111
Decay B+
@@ -109,6 +137,21 @@ Decay B+
109137
0.000108000 J/psi eta K+ PHSP; #[New mode added] #[Reconstructed PDG2011]
110138
0.000350000 J/psi omega K+ PHSP; #[New mode added] #[Reconstructed PDG2011]
111139
0.000011800 J/psi p+ anti-Lambda0 PHSP; #[New mode added] #[Reconstructed PDG2011]
140+
141+
# --- chi_c1 ---
142+
0.000022000 chi_c1 pi+ SVS;
143+
0.000474000 chi_c1 K+ SVS;
144+
0.000300000 chi_c1 K*+ SVV_HELAMP 1.0 0.0 0.0;
145+
0.000329000 chi_c1 K+ pi0 PHSP;
146+
0.000580000 chi_c1 K0 pi+ PHSP;
147+
0.000374000 chi_c1 K+ pi+ pi- PHSP;
148+
149+
# --- chi_c2 ---
150+
0.000110000 chi_c2 K+ SVS;
151+
0.000120000 chi_c2 K*+ SVV_HELAMP 1.0 0.0 0.0;
152+
0.000062000 chi_c2 K+ pi0 PHSP;
153+
0.000124000 chi_c2 K0 pi+ PHSP;
154+
0.000134000 chi_c2 K+ pi+ pi- PHSP;
112155
Enddecay
113156

114157
Decay B-
@@ -139,6 +182,21 @@ Decay B-
139182
0.000108000 J/psi eta K- PHSP; #[New mode added] #[Reconstructed PDG2011]
140183
0.000350000 J/psi omega K- PHSP; #[New mode added] #[Reconstructed PDG2011]
141184
0.000011800 J/psi anti-p- Lambda0 PHSP; #[New mode added] #[Reconstructed PDG2011]
185+
186+
# --- chi_c1 ---
187+
0.000022000 chi_c1 pi- SVS;
188+
0.000474000 chi_c1 K- SVS;
189+
0.000300000 chi_c1 K*- SVV_HELAMP 1.0 0.0 0.0;
190+
0.000329000 chi_c1 K- pi0 PHSP;
191+
0.000580000 chi_c1 anti-K0 pi- PHSP;
192+
0.000374000 chi_c1 K- pi- pi+ PHSP;
193+
194+
# --- chi_c2 ---
195+
0.000110000 chi_c2 K- SVS;
196+
0.000120000 chi_c2 K*- SVV_HELAMP 1.0 0.0 0.0;
197+
0.000062000 chi_c2 K- pi0 PHSP;
198+
0.000124000 chi_c2 anti-K0 pi- PHSP;
199+
0.000134000 chi_c2 K- pi- pi+ PHSP;
142200
Enddecay
143201

144202
Decay B_s0
@@ -182,6 +240,9 @@ Decay B_s0
182240
0.0002 J/psi pi0 pi0 PHSP;
183241
# PR LHCb 04/08/2004 : add Bs -> phi mu mu, phi e e
184242
0.0000023 phi e+ e- BTOSLLALI;
243+
244+
# --- chi_c1 ---
245+
0.0001970 chi_c1 phi SVV_HELAMP 1.0 0.0 0.0;
185246
Enddecay
186247

187248
Decay anti-B_s0
@@ -224,18 +285,29 @@ Decay anti-B_s0
224285
0.0002 J/psi pi0 pi0 PHSP;
225286
# PR LHCb 04/08/2004 : add Bs -> phi mu mu, phi e e
226287
0.0000023 phi e- e+ BTOSLLALI;
288+
289+
# --- chi_c1 ---
290+
0.0001970 chi_c1 phi SVV_HELAMP 1.0 0.0 0.0;
227291
Enddecay
228292

229293
Decay Lambda_b0
230294
###
231295
0.00038 Lambda0 psi(2S) PHSP;
232296
0.00047 Lambda0 J/psi PHSP;
297+
0.0000760 chi_c1 p K- PHSP;
298+
0.0000050 chi_c1 p pi- PHSP;
299+
0.0000770 chi_c2 p K- PHSP;
300+
0.0000048 chi_c2 p pi- PHSP;
233301
Enddecay
234302

235303
Decay anti-Lambda_b0
236304
###
237305
0.00038 anti-Lambda0 psi(2S) PHSP;
238306
0.00047 anti-Lambda0 J/psi PHSP;
307+
0.0000760 chi_c1 anti-p K+ PHSP;
308+
0.0000050 chi_c1 anti-p pi+ PHSP;
309+
0.0000770 chi_c2 anti-p K+ PHSP;
310+
0.0000048 chi_c2 anti-p pi+ PHSP;
239311
Enddecay
240312

241313
Decay Xi_b-
@@ -264,6 +336,19 @@ Decay anti-Omega_b+
264336
Enddecay
265337

266338

339+
# =============================================================================================================================
340+
# JPsi, Psi(2S), ChiC Decays
341+
# =============================================================================================================================
342+
###
343+
Decay chi_c1
344+
1.000 J/psi gamma PHSP;
345+
Enddecay
346+
347+
###
348+
Decay chi_c2
349+
1.000 J/psi gamma PHSP;
350+
Enddecay
351+
267352
Decay psi(2S)
268353
### from DECAY.DEC
269354
1.000 e+ e- PHOTOS VLL;

‎MC/config/PWGUD/ini/makeStarlightConfig.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
parser.add_argument('--collType',default='PbPb', choices=['PbPb', 'pPb', 'Pbp', 'pp', 'OO', 'pO', 'Op', 'NeNe'],
1212
help='Colission system')
13-
13+
1414
parser.add_argument('--eCM', type=float, default='5360',
1515
help='Centre-of-mass energy')
1616

1717
parser.add_argument('--rapidity', default='cent', choices=['cent_rap', 'muon_rap', 'cent_eta', 'muon_eta'],
1818
help='Rapidity to select')
1919

20-
parser.add_argument('--process',default=None, choices=['kTwoGammaToMuLow', 'kTwoGammaToElLow', 'kTwoGammaToMuMedium', 'kTwoGammaToElMedium', 'kTwoGammaToMuHigh', 'kTwoGammaToElHigh', 'kTwoGammaToRhoRho', 'kTwoGammaToF2', 'kCohRhoToPi', 'kCohRhoToElEl', 'kCohRhoToMuMu', 'kCohRhoToPiWithCont', 'kCohRhoToPiFlat', 'kCohPhiToKa', 'kDirectPhiToKaKa', 'kCohPhiToEl', 'kCohOmegaTo2Pi', 'kCohOmegaTo3Pi', 'kCohOmegaToPiPiPi', 'kCohRhoPrimeTo4Pi', 'kCohJpsiToMu', 'kCohJpsiToEl', 'kCohJpsiToElRad', 'kCohJpsiToProton', 'kCohJpsiToLLbar', 'kCohJpsi4Prong', 'kCohJpsi6Prong', 'kCohPsi2sToMu','kCohPsi2sToEl', 'kCohPsi2sToMuPi', 'kCohPsi2sToElPi', 'kCohUpsilonToMu', 'kCohUpsilonToEl', 'kIncohRhoToPi', 'kIncohRhoToElEl', 'kIncohRhoToMuMu', 'kIncohRhoToPiWithCont', 'kIncohRhoToPiFlat', 'kIncohPhiToKa', 'kIncohOmegaTo2Pi', 'kIncohOmegaTo3Pi', 'kIncohOmegaToPiPiPi', 'kIncohRhoPrimeTo4Pi', 'kIncohJpsiToMu', 'kIncohJpsiToEl', 'kIncohJpsiToElRad', 'kIncohJpsiToProton', 'kIncohJpsiToLLbar', 'kIncohPsi2sToMu', 'kIncohPsi2sToEl', 'kIncohPsi2sToMuPi', 'kIncohPsi2sToElPi', 'kIncohUpsilonToMu', 'kIncohUpsilonToEl', 'kDpmjetSingleA', 'kDpmjetSingleA_Dzero', 'kDpmjetSingleA_Dcharged', 'kDpmjetSingleA_Dstar', 'kDpmjetSingleA_Phi', 'kDpmjetSingleA_Kstar', 'kDpmjetSingleC', 'kDpmjetSingleC_Dzero', 'kDpmjetSingleC_Dcharged', 'kDpmjetSingleC_Dstar', 'kDpmjetSingleC_Phi', 'kDpmjetSingleC_Kstar', 'kTauLowToEl3Pi', 'kTauLowToPo3Pi', 'kTauMediumToEl3Pi', 'kTauMediumToPo3Pi', 'kTauHighToEl3Pi', 'kTauHighToPo3Pi', 'kTauLowToElMu', 'kTauLowToElPiPi0', 'kTauLowToPoPiPi0'],
20+
parser.add_argument('--process',default=None, choices=['kTwoGammaToMuLow', 'kTwoGammaToElLow', 'kTwoGammaToMuMedium', 'kTwoGammaToElMedium', 'kTwoGammaToMuHigh', 'kTwoGammaToElHigh', 'kTwoGammaToRhoRho', 'kTwoGammaToF2', 'kCohRhoToPi', 'kCohRhoToElEl', 'kCohRhoToMuMu', 'kCohRhoToPiWithCont', 'kCohRhoToPiFlat', 'kCohPhiToKa', 'kDirectPhiToKaKa', 'kCohPhiToEl', 'kCohOmegaTo2Pi', 'kCohOmegaTo3Pi', 'kCohOmegaToPiPiPi', 'kCohRhoPrimeTo4Pi', 'kCohJpsiToMu', 'kCohJpsiToEl', 'kCohJpsiToElRad', 'kCohJpsiToProton', 'kCohJpsiToLLbar', 'kCohJpsi4Prong', 'kCohJpsi6Prong', 'kCohPsi2sToMu','kCohPsi2sToEl', 'kCohPsi2sToMuPi', 'kCohPsi2sToElPi', 'kCohUpsilonToMu', 'kCohUpsilonToEl', 'kIncohRhoToPi', 'kIncohRhoToElEl', 'kIncohRhoToMuMu', 'kIncohRhoToPiWithCont', 'kIncohRhoToPiFlat', 'kIncohPhiToKa', 'kIncohOmegaTo2Pi', 'kIncohOmegaTo3Pi', 'kIncohOmegaToPiPiPi', 'kIncohRhoPrimeTo4Pi', 'kIncohJpsiToMu', 'kIncohJpsiToEl', 'kIncohJpsiToElRad', 'kIncohJpsiToProton', 'kIncohJpsiToLLbar', 'kIncohPsi2sToMu', 'kIncohPsi2sToEl', 'kIncohPsi2sToMuPi', 'kIncohPsi2sToElPi', 'kIncohUpsilonToMu', 'kIncohUpsilonToEl', 'kDpmjetSingleA', 'kDpmjetSingleA_Dzero', 'kDpmjetSingleA_Dcharged', 'kDpmjetSingleA_Dstar', 'kDpmjetSingleA_Phi', 'kDpmjetSingleA_Kstar', 'kDpmjetSingleC', 'kDpmjetSingleC_Dzero', 'kDpmjetSingleC_Dcharged', 'kDpmjetSingleC_Dstar', 'kDpmjetSingleC_Phi', 'kDpmjetSingleC_Kstar', 'kTauLowToL+3Pi', 'kTauLowToL-3Pi', 'kTauLowToPi+3Pi', 'kTauLowToPi-3Pi', 'kTauLowTo6Pi', 'kTauLowToElMu', 'kTauLowToElPiPi0', 'kTauLowToPoPiPi0'],
2121
help='Process to switch on')
22-
23-
22+
23+
2424
parser.add_argument('--output', default='GenStarlight.ini',
2525
help='Where to write the configuration')
2626

@@ -63,17 +63,17 @@
6363
pZ = 8
6464
pA = 16
6565
tZ = 8
66-
tA = 16
66+
tA = 16
6767
if 'pO' in args.collType:
6868
pZ = 1
6969
pA = 1
7070
tZ = 8
71-
tA = 16
71+
tA = 16
7272
if 'Op' in args.collType:
7373
pZ = 8
7474
pA = 16
7575
tZ = 1
76-
tA = 1
76+
tA = 1
7777
if 'NeNe' in args.collType:
7878
pZ = 10
7979
pA = 20
@@ -95,7 +95,7 @@
9595
else:
9696
fout.write('fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGUD/external/generator/GeneratorStarlight.C \n')
9797
fout.write('funcName = GeneratorStarlight("%s", %f, %d, %d, %d, %d, "%s", "%s") \n' % (args.process.split('_')[0],args.eCM ,pZ,pA,tZ,tA,args.extraPars,args.dpmjetConf))
98-
98+
9999
###Trigger
100100
if not 'kDpmjet' in args.process:
101101
fout.write('[TriggerExternal] \n')

‎MC/config/common/ini/pythia8_OO_rescattering_536.ini‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Diamond]
2+
width[2]=6.0
3+
4+
[GeneratorExternal]
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
6+
funcName=generator_pythia8_ALICE3()
7+
8+
[GeneratorPythia8]
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_OO_rescattering_536.cfg

‎MC/config/common/ini/tests/pythia8_OO_rescattering_536.C‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
int External() {
2+
std::string path{"o2sim_Kine.root"};
3+
4+
TFile file(path.c_str(), "READ");
5+
if (file.IsZombie()) {
6+
std::cerr << "Cannot open ROOT file " << path << "\n";
7+
return 1;
8+
}
9+
10+
auto tree = (TTree *)file.Get("o2sim");
11+
if (!tree) {
12+
std::cerr << "Cannot find tree o2sim in file " << path << "\n";
13+
return 1;
14+
}
15+
std::vector<o2::MCTrack> *tracks{};
16+
tree->SetBranchAddress("MCTrack", &tracks);
17+
18+
auto nEvents = tree->GetEntries();
19+
if (nEvents == 0) {
20+
std::cerr << "No event of interest\n";
21+
return 1;
22+
}
23+
return 0;
24+
}

‎MC/config/common/pythia8/generator/pythia8_OO_rescattering_536.cfg‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
### OO beams
2+
Beams:idA = 1000080160
3+
Beams:idB = 1000080160
4+
Beams:eCM = 5360.0 ### energy
5+
6+
Beams:frameType = 1
7+
ParticleDecays:limitTau0 = on
8+
ParticleDecays:tau0Max = 10. ### match alice: 1cm/c = 10.0mm/c
9+
10+
### Save some CPU at init of jobs
11+
### To avoid refitting, add the following lines to your configuration file:
12+
HeavyIon:SigFitNGen = 0
13+
HeavyIon:SigFitDefPar = 2.15,18.42,0.33
14+
15+
### enable hadronic rescattering
16+
HadronLevel:Rescatter = on # default = off
17+
Fragmentation:setVertices = on # default = off
18+
PartonVertex:setVertex = on # default = off
19+
Rescattering:nearestNeighbours = off # default = on (but "require a larger retuning effort")
20+
Rescattering:inelastic = on # default = on
21+
22+
Random:setSeed = on

0 commit comments

Comments
 (0)