Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MC/bin/o2dpg_sim_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True, runcommand=True):
if eventOffset == None:
eventOffset = 0
cmd = 'export HEPMCEVENTSKIP=$(${O2DPG_ROOT}/UTILS/InitHepMCEventSkip.sh ../HepMCEventSkip.json ' + str(eventOffset) + ');'
elif tf > 1:
else:
# determine the skip number
cmd = 'export HEPMCEVENTSKIP=$(${O2DPG_ROOT}/UTILS/ReadHepMCEventSkip.sh ../HepMCEventSkip.json ' + str(tf) + ');'
SGNGENtask['cmd'] = cmd
Expand Down
52 changes: 12 additions & 40 deletions MC/config/PWGUD/ini/makeStarlightConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,46 +39,18 @@
if args.nOOn:
args.extraPars = 'BREAKUP_MODE = 4'

if 'PbPb' in args.collType:
pZ = 82
pA = 208
tZ = 82
tA = 208
if 'pPb' in args.collType:
pZ = 1
pA = 1
tZ = 82
tA = 208
if 'Pbp' in args.collType:
pZ = 82
pA = 208
tZ = 1
tA = 1
if 'pp' in args.collType:
pZ = 1
pA = 1
tZ = 1
tA = 1
if 'OO' in args.collType:
pZ = 8
pA = 16
tZ = 8
tA = 16
if 'pO' in args.collType:
pZ = 1
pA = 1
tZ = 8
tA = 16
if 'Op' in args.collType:
pZ = 8
pA = 16
tZ = 1
tA = 1
if 'NeNe' in args.collType:
pZ = 10
pA = 20
tZ = 10
tA = 20
# (projectile Z, A, target Z, A) for each collision system
beams = {
'PbPb': (82, 208, 82, 208),
'pPb': (1, 1, 82, 208),
'Pbp': (82, 208, 1, 1),
'pp': (1, 1, 1, 1),
'OO': (8, 16, 8, 16),
'pO': (1, 1, 8, 16),
'Op': (8, 16, 1, 1),
'NeNe': (10, 20, 10, 20),
}
pZ, pA, tZ, tA = beams[args.collType]

### open output file
fout = open(args.output, 'w')
Expand Down
9 changes: 2 additions & 7 deletions MC/config/PWGUD/ini/makeUpcgenConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@

args = parser.parse_args()

if 'PbPb' in args.collType:
pZ = 82
pA = 208

if 'OO' in args.collType:
pZ = 8
pA = 16
# (projectile Z, A) for each collision system
pZ, pA = {'PbPb': (82, 208), 'OO': (8, 16)}[args.collType]

### open output file
fout = open(args.output, 'w')
Expand Down
1 change: 1 addition & 0 deletions MC/prodinfo/mcprodinfo_harvester.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def extract_from_zip(local_zip_path):

def build_info(prod_tag, run_number, wf_data, env_vars):
meta=wf_data.get("meta")
int_rate = col_system = orbits_per_tf = None
if meta != None:
int_rate = meta.get("interactionRate")
col_system = meta.get("col")
Expand Down
Loading