Skip to content

Commit 85a5a6f

Browse files
gconesabgconesab
committed
introduce heavy_ion process, rename process heavy to heavy_q, add dependency on new bkg configuration task
1 parent 20bfdeb commit 85a5a6f

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

‎MC/bin/o2dpg_sim_workflow.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
parser.add_argument('--embedding',action='store_true', help='With embedding into background')
5353
parser.add_argument('-nb',help='number of background events / timeframe', default=20)
5454
parser.add_argument('-genBkg',help='embedding background generator', default='') #pythia8, not recomended: pythia8hi, pythia8pp
55-
parser.add_argument('-procBkg',help='process type: inel, ..., do not set it for Pythia8 PbPb', default='none')
55+
parser.add_argument('-procBkg',help='process type: inel, ..., do not set it for Pythia8 PbPb', default='heavy_ion')
5656
parser.add_argument('-iniBkg',help='embedding background generator init parameters file', default='${O2DPG_ROOT}/MC/config/common/ini/basic.ini')
5757
parser.add_argument('-confKeyBkg',help='embedding background configuration key values, for example: GeneratorPythia8.config=pythia8bkg.cfg', default='')
5858
parser.add_argument('-colBkg',help='embedding background collision system', default='PbPb')
@@ -149,7 +149,7 @@ def getDPL_global_options(bigshm=False,nosmallrate=False):
149149
print('o2dpg_sim_workflow: Set BKG CM Energy to PbPb case 5.02 TeV')
150150
ECMSBKG=5020.0
151151
if GENBKG == 'pythia8':
152-
PROCESSBKG = 'none'
152+
PROCESSBKG = 'heavy_ion'
153153
print('o2dpg_sim_workflow: Process type not considered for Pythia8 PbPb')
154154

155155
if COLTYPEBKG == 'pPb':
@@ -203,7 +203,7 @@ def getDPL_global_options(bigshm=False,nosmallrate=False):
203203
if args.iniBkg!= '':
204204
INIBKG=' --configFile ' + args.iniBkg
205205

206-
BKGtask=createTask(name='bkgsim', lab=["GEANT"], cpu=NWORKERS)
206+
BKGtask=createTask(name='bkgsim', lab=["GEANT"], needs=[BKG_CONFIG_task['name']], cpu=NWORKERS )
207207
BKGtask['cmd']='o2-sim -e ' + SIMENGINE + ' -j ' + str(NWORKERS) + ' -n ' + str(NBKGEVENTS) \
208208
+ ' -g ' + str(GENBKG) + ' ' + str(MODULES) + ' -o bkg ' + str(INIBKG) \
209209
+ ' --field ' + str(BFIELD) + ' ' + str(CONFKEYBKG)

‎MC/config/common/pythia8/utils/mkpy8cfg.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
parser.add_argument('--eCM', type=float, default='-1',
2727
help='Centre-of-mass energy (careful!, better use beam energy)')
2828

29-
parser.add_argument('--process', default='inel', choices=['none', 'inel', 'ccbar', 'bbbar', 'heavy', 'jets', 'dirgamma', 'cdiff'],
29+
parser.add_argument('--process', default='inel', choices=['none', 'inel', 'ccbar', 'bbbar', 'heavy_q', 'jets', 'dirgamma', 'cdiff','heavy_ion'],
3030
help='Process to switch on')
3131

3232
parser.add_argument('--ptHatMin', type=float,
@@ -94,14 +94,14 @@
9494

9595
### processes
9696
fout.write('### processes \n')
97-
if args.idA == 2212 or args.idB == 2212:
97+
if args.process != 'heavy_ion':
9898
fout.write('SoftQCD:inelastic = off \n') ### we switch this off because it might be on by default, but only for pp or pPb,
9999
#in PbPb let's not force it in case it is needed in Angantyr
100100
if args.process == 'inel':
101101
fout.write('SoftQCD:inelastic = on \n')
102-
if args.process == 'ccbar' or args.process == 'heavy':
102+
if args.process == 'ccbar' or args.process == 'heavy_q':
103103
fout.write('HardQCD:hardccbar = on \n')
104-
if args.process == 'bbbar' or args.process == 'heavy':
104+
if args.process == 'bbbar' or args.process == 'heavy_q':
105105
fout.write('HardQCD:hardbbbar = on \n')
106106
if args.process == 'jets':
107107
fout.write('HardQCD:all = on \n')
@@ -114,7 +114,7 @@
114114
fout.write('\n')
115115

116116
### heavy ion settings (valid for Pb-Pb 5520 only)
117-
if args.idA==1000822080 and args.idB==1000822080:
117+
if args.process == 'heavy_ion':
118118
fout.write('### heavy-ion settings (valid for Pb-Pb 5520 only) \n')
119119
fout.write('HeavyIon:SigFitNGen = 0 \n')
120120
fout.write('HeavyIon:SigFitDefPar = 13.88,1.84,0.22,0.0,0.0,0.0,0.0,0.0 \n')

‎MC/run/PWGGAJE/run_dirgamma_embedding.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export CONFIG_OUTPARTON_PDG=${CONFIG_OUTPARTON_PDG:-0}
5757
# create workflow
5858
${O2DPG_ROOT}/MC/bin/o2dpg_sim_workflow.py -eCM ${CONFIG_ENERGY} \
5959
-nb ${NBKGEVENTS} --embedding \
60-
-colBkg PbPb -genBkg pythia8 -procBkg "none" \
60+
-colBkg PbPb -genBkg pythia8 -procBkg "heavy_ion" \
6161
-col pp -gen pythia8 -proc "dirgamma" \
6262
-ptHatMin ${PTHATMIN} -ptHatMax ${PTHATMAX} \
6363
-tf ${NTIMEFRAMES} -ns ${NSIGEVENTS} -e ${SIMENGINE} \

‎MC/run/PWGGAJE/run_dirgamma_hook_embedding.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ echo 'Parton PDG option ' $CONFIG_OUTPARTON_PDG
6363
# create workflow
6464
${O2DPG_ROOT}/MC/bin/o2dpg_sim_workflow.py -eCM ${CONFIG_ENERGY} \
6565
-nb ${NBKGEVENTS} --embedding \
66-
-colBkg PbPb -genBkg pythia8 -procBkg "none" \
66+
-colBkg PbPb -genBkg pythia8 -procBkg "heavy_ion" \
6767
-col pp -gen pythia8 -proc "dirgamma" \
6868
-ptHatMin ${PTHATMIN} -ptHatMax ${PTHATMAX} \
6969
-tf ${NTIMEFRAMES} -ns ${NSIGEVENTS} -e ${SIMENGINE} \

‎MC/run/PWGGAJE/run_jets_embedding.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
RNDSEED=${RNDSEED:-0} # [default = 0] time-based random seed
1616
NSIGEVENTS=${NSIGEVENTS:-2}
1717
NBKGEVENTS=${NBKGEVENTS:-1}
18-
NTIMEFRAMES=${NTIMEFRAMES:-1}
18+
NTIMEFRAMES=${NTIMEFRAMES:-5}
1919
NWORKERS=${NWORKERS:-8}
2020
MODULES="--skipModules ZDC" #"PIPE ITS TPC EMCAL"
2121
CONFIG_ENERGY=${CONFIG_ENERGY:-5020.0}
@@ -43,7 +43,7 @@ fi
4343
# create workflow
4444
${O2DPG_ROOT}/MC/bin/o2dpg_sim_workflow.py -eCM ${CONFIG_ENERGY} \
4545
-nb ${NBKGEVENTS} --embedding \
46-
-colBkg PbPb -genBkg pythia8 -procBkg "none" \
46+
-colBkg PbPb -genBkg pythia8 -procBkg "heavy_ion" \
4747
-col pp -gen pythia8 -proc "jets" \
4848
-ptHatMin ${PTHATMIN} -ptHatMax ${PTHATMAX} \
4949
-tf ${NTIMEFRAMES} -ns ${NSIGEVENTS} -e ${SIMENGINE} \

‎MC/run/PWGHF/embedding_benchmark.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PYPROCESS=${PYPROCESS:-ccbar} #ccbar, bbar, ...
2525

2626
# create workflow
2727
${O2DPG_ROOT}/MC/bin/o2dpg_sim_workflow.py -eCM 5020 -col pp -gen pythia8 -proc ${PYPROCESS} \
28-
-colBkg PbPb -genBkg pythia8 -procBkg "none" \
28+
-colBkg PbPb -genBkg pythia8 -procBkg "heavy_ion" \
2929
-tf ${NTIMEFRAMES} -nb ${NBKGEVENTS} \
3030
-ns ${NSIGEVENTS} -e ${SIMENGINE} \
3131
-j ${NWORKERS} --embedding -interactionRate 50000

0 commit comments

Comments
 (0)