@@ -207,14 +207,9 @@ def retrieve_sor(run_number):
207207
208208 return int (SOR )
209209
210- CONFKEY = ''
211- if args .confKey != '' :
212- CONFKEY = ' --configKeyValues "' + args .confKey + '"'
213-
214210# Recover mean vertex settings from external txt file
215-
216211if len (args .meanVertexPerRunTxtFile ) > 0 :
217- if "Diamond" in CONFKEY :
212+ if "Diamond" in args . confKey :
218213 print ("confKey already sets diamond, stop!" )
219214 sys .exit ()
220215 #df = pd.read_csv(args.vertexPerRunFile, sep=" ", header=None) # for single space
@@ -229,8 +224,10 @@ def retrieve_sor(run_number):
229224 MV_VZ = float (df .loc [df ['runNumber' ].eq (args .run ), 'vz' ])
230225 print ("** Using mean vertex parameters from file" ,args .meanVertexPerRunTxtFile ,"for run =" ,args .run ,
231226 ": \n \t vx =" ,MV_VX ,", vy =" ,MV_VY ,", vz =" ,MV_VZ ,",\n \t sx =" ,MV_SX ,", sy =" ,MV_SY ,", sz =" ,MV_SZ )
232- CONFKEY = CONFKEY + ' "Diamond.width[2]=' + str (MV_SZ )+ ';Diamond.width[1]=' + str (MV_SY )+ ';Diamond.width[0]=' + str (MV_SX )+ ';Diamond.position[2]=' + str (MV_VZ )+ ';Diamond.position[1]=' + str (MV_VY )+ ';Diamond.position[0]=' + str (MV_VX )+ '"'
233- print ("** New confKey:" ,CONFKEY )
227+ CONFKEYMV = 'Diamond.width[2]=' + str (MV_SZ )+ ';Diamond.width[1]=' + str (MV_SY )+ ';Diamond.width[0]=' + str (MV_SX )+ ';Diamond.position[2]=' + str (MV_VZ )+ ';Diamond.position[1]=' + str (MV_VY )+ ';Diamond.position[0]=' + str (MV_VX )+ ';'
228+ args .confKey = args .confKey + CONFKEYMV
229+ args .confKeyBkg = args .confKeyBkg + CONFKEYMV
230+ print ("** confKey args + MeanVertex:" ,args .confKey )
234231
235232# ----------- START WORKFLOW CONSTRUCTION -----------------------------
236233
@@ -448,6 +445,9 @@ def getDPL_global_options(bigshm=False):
448445 INIFILE = ''
449446 if args .ini != '' :
450447 INIFILE = ' --configFile ' + args .ini
448+ CONFKEY = ''
449+ if args .confKey != '' :
450+ CONFKEY = ' --configKeyValues "' + args .confKey + '"'
451451 PROCESS = args .proc
452452 TRIGGER = ''
453453 if args .trigger != '' :
0 commit comments