Skip to content

Commit b7bae82

Browse files
committed
Take field for sim from CCDB
The field CCDB object is created as first step before simulation and Geant should just use this for better consistency.
1 parent 25c3abc commit b7bae82

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

MC/bin/o2dpg_sim_workflow.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True):
437437
BKGtask=createTask(name='bkgsim', lab=["GEANT"], needs=[BKG_CONFIG_task['name'], GRP_TASK['name']], cpu=NWORKERS )
438438
BKGtask['cmd']='${O2_ROOT}/bin/o2-sim -e ' + SIMENGINE + ' -j ' + str(NWORKERS) + ' -n ' + str(NBKGEVENTS) \
439439
+ ' -g ' + str(GENBKG) + ' ' + str(MODULES) + ' -o bkg ' + str(INIBKG) \
440-
+ ' --field ' + str(BFIELD) + ' ' + str(CONFKEYBKG) \
440+
+ ' --field ccdb ' + str(CONFKEYBKG) \
441441
+ ('',' --timestamp ' + str(args.timestamp))[args.timestamp!=-1] + ' --run ' + str(args.run) \
442442
+ ' --vertexMode kCCDB'
443443

@@ -612,9 +612,8 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True):
612612
# ATTENTION: CHANGING THE PARAMETERS/CUTS HERE MIGHT INVALIDATE THE QED INTERACTION RATES USED ELSEWHERE
613613
#
614614
########################################################################################################
615-
QED_task['cmd'] = 'o2-sim -e TGeant3 --field ' + str(BFIELD) + ' \
616-
-j ' + str('1') + ' -o qed_' + str(tf) + ' \
617-
-n ' + str(NEventsQED) + ' -m PIPE ITS MFT FT0 FV0 FDD ' \
615+
QED_task['cmd'] = 'o2-sim -e TGeant3 --field ccdb -j ' + str('1') + ' -o qed_' + str(tf) \
616+
+ ' -n ' + str(NEventsQED) + ' -m PIPE ITS MFT FT0 FV0 FDD ' \
618617
+ ('', ' --timestamp ' + str(args.timestamp))[args.timestamp!=-1] + ' --run ' + str(args.run) \
619618
+ ' --seed ' + str(TFSEED) \
620619
+ ' -g extgen --configKeyValues \"GeneratorExternal.fileName=$O2_ROOT/share/Generators/external/QEDLoader.C;QEDGenParam.yMin=-7;QEDGenParam.yMax=7;QEDGenParam.ptMin=0.001;QEDGenParam.ptMax=1.;Diamond.width[2]=6.\"' # + (' ',' --fromCollContext collisioncontext.root')[args.pregenCollContext]
@@ -672,7 +671,7 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True):
672671
sgnmem = 6000 if COLTYPE == 'PbPb' else 4000
673672
SGNtask=createTask(name='sgnsim_'+str(tf), needs=signalneeds, tf=tf, cwd='tf'+str(tf), lab=["GEANT"], relative_cpu=7/8, n_workers=NWORKERS, mem=str(sgnmem))
674673
SGNtask['cmd']='${O2_ROOT}/bin/o2-sim -e ' + str(SIMENGINE) + ' ' + str(MODULES) + ' -n ' + str(NSIGEVENTS) + ' --seed ' + str(TFSEED) \
675-
+ ' --field ' + str(BFIELD) + ' -j ' + str(NWORKERS) + ' -g ' + str(GENERATOR) \
674+
+ ' --field ccdb -j ' + str(NWORKERS) + ' -g ' + str(GENERATOR) \
676675
+ ' ' + str(TRIGGER) + ' ' + str(CONFKEY) + ' ' + str(INIFILE) \
677676
+ ' -o ' + signalprefix + ' ' + embeddinto \
678677
+ ('', ' --timestamp ' + str(args.timestamp))[args.timestamp!=-1] + ' --run ' + str(args.run) \

0 commit comments

Comments
 (0)