use same parameter naming as PYTHIA for collision and beams energy

Author: gconesab

MC/bin/o2dpg_sim_workflow.py

@@ -25,9 +25,9 @@
 parser.add_argument('-ini',help='generator init parameters file, for example: ${O2DPG_ROOT}/MC/config/PWGHF/ini/GeneratorHF.ini', default='')
 parser.add_argument('-confKey',help='generator or trigger configuration key values, for example: GeneratorPythia8.config=pythia8.cfg', default='')
 
-parser.add_argument('-eCMS',help='CMS energy', default=-1)
-parser.add_argument('-eBeamA',help='Beam A energy', default=6499.) #6369 PbPb, 2.510 pp 5 TeV, 4 pPb
-parser.add_argument('-eBeamB',help='Beam B energy', default=-1)
+parser.add_argument('-eCM',help='CMS energy', default=-1)
+parser.add_argument('-eA',help='Beam A energy', default=6499.) #6369 PbPb, 2.510 pp 5 TeV, 4 pPb
+parser.add_argument('-eB',help='Beam B energy', default=-1)
 parser.add_argument('-col',help='collision sytem: pp, PbPb, pPb, Pbp, ...', default='pp')
 parser.add_argument('-ptHatBin',help='pT hard bin number', default=-1)
 parser.add_argument('-ptHatMin',help='pT hard minimum when no bin requested', default=0)
@@ -162,9 +162,9 @@ def getDPL_global_options(bigshm=False,nosmallrate=False):
    # function encapsulating the signal sim part
    # first argument is timeframe id
    RNDSEED=args.seed    # 0 means random seed !
-   ECMS=float(args.eCMS)
-   EBEAMA=float(args.eBeamA)
-   EBEAMB=float(args.eBeamB)
+   ECMS=float(args.eCM)
+   EBEAMA=float(args.eA)
+   EBEAMB=float(args.eB)
    NSIGEVENTS=args.ns
    GENERATOR=args.gen
    INIFILE=''

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

@@ -17,10 +17,10 @@
 parser.add_argument('--idB', type=int, default='2212',
                    help='PDG code of target beam B')
 
-parser.add_argument('--eBeamA', type=float, default='6499.',
+parser.add_argument('--eA', type=float, default='6499.',
                     help='Energy of beam A')
 
-parser.add_argument('--eBeamB', type=float, default='6499.',
+parser.add_argument('--eB', type=float, default='6499.',
                     help='Energy of beam B')
 
 parser.add_argument('--eCM', type=float, default='-1',
@@ -84,9 +84,9 @@
 fout.write('Beams:idB = %d \n' % (args.idB))
 if args.eCM > 0:
    fout.write('Beams:eCM = %f \n' % (args.eCM))
-elif args.eBeamA > 0 and args.eBeamB > 0:
-   fout.write('Beams:eA = %f \n' % (args.eBeamA))
-   fout.write('Beams:eB = %f \n' % (args.eBeamB))
+elif args.eA > 0 and args.eB > 0:
+   fout.write('Beams:eA = %f \n' % (args.eA))
+   fout.write('Beams:eB = %f \n' % (args.eB))
 else:
    print('mkpy8cfg.py: Error, CM or Beam Energy not set!!!')
    exit(1)