From 0c80ff24669c6e1b198644ad2c5e99ff6e7ae744 Mon Sep 17 00:00:00 2001 From: Efe Date: Mon, 29 Apr 2024 13:29:38 +0200 Subject: [PATCH] fix powheg+madspin check --- bin/utils/request_fragment_check.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/utils/request_fragment_check.py b/bin/utils/request_fragment_check.py index 507e139efedb..43ec691a341d 100755 --- a/bin/utils/request_fragment_check.py +++ b/bin/utils/request_fragment_check.py @@ -746,6 +746,7 @@ def root_requests_from_ticket(ticket_prepid, include_docs=False): gp_size = len(gridpack_cvmfs_path_tmp) pw_gp = False + pw_external_gp = False madloop_in_gp = False minlo = False minnlo = False @@ -827,12 +828,15 @@ def root_requests_from_ticket(ticket_prepid, include_docs=False): sys.exit() jhu_gp = os.path.isfile(my_path+'/'+pi+'/'+'JHUGen.input') pw_gp = os.path.isfile(my_path+'/'+pi+'/'+'powheg.input') + if pw_gp is False: + pw_external_gp = os.path.isfile(my_path+'/'+pi+'/'+"external_tarball/powheg.input") madloop_in_gp = os.path.isfile(my_path+'/'+pi+'/'+'MadLoopParams.dat') mg_f1 = my_path+'/'+pi+'/'+'process/madevent/Cards/run_card.dat' mg_f2 = my_path+'/'+pi+'/'+'process/Cards/run_card.dat' amcnlo_gp = os.path.isfile(my_path+'/'+pi+'/'+'process/Cards/run_card.dat') mg_gp = os.path.isfile(mg_f1) or os.path.isfile(mg_f2) print("path powheg "+str(pw_gp)) + print("path external powheg "+str(pw_external_gp)) print("path madloop "+str(madloop_in_gp)) print("path mg "+str(mg_gp)) print("path amcnlo "+str(amcnlo_gp)) @@ -1593,8 +1597,9 @@ def root_requests_from_ticket(ticket_prepid, include_docs=False): errors.append("You run MG5_aMC@NLO at LO but you have Pythia8aMCatNLOSettings_cfi in fragment") if mg_gp is True or amcnlo_gp is True: + input_cards_madspin_card = 0 powhegcheck.append(int(os.popen('grep -c -i PowhegEmission '+pi_file).read())) - if powhegcheck[0] > 0 and pw_mg == 0: + if powhegcheck[0] > 0 and pw_mg == 0 and pw_external_gp is False: errors.append("Please remove POWHEG settings for MG requests.") if pw_mg is False and mg_gp is False and amcnlo_gp is False and jhu_gp is False and sherpa_gp is False: purepythiacheck.append(int(os.popen('grep -c -i Pythia8aMCatNLOSettings '+pi_file).read()))