From 6b40ed03f84c08df30071144fe3e49231970c24f Mon Sep 17 00:00:00 2001
From: Ewelina Maria Lobodzinska <ewelina.maria.lobodzinska@cern.ch>
Date: Thu, 9 Sep 2021 10:12:49 +0200
Subject: [PATCH] Merge branch '21.6_MGC_SDE_Strategy_Patch' into '21.6'

Patching MadGraphControl use of sde_strategy

See merge request atlas/athena!46391

(cherry picked from commit 3d581e0146c1da3b79500d2cee26daf1baec7274)

a781a54a Patching MadGraphControl use of sde_strategy
---
 Generators/MadGraphControl/python/MadGraphUtils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Generators/MadGraphControl/python/MadGraphUtils.py b/Generators/MadGraphControl/python/MadGraphUtils.py
index d47343fbbcd7..0fb6d90e6027 100755
--- a/Generators/MadGraphControl/python/MadGraphUtils.py
+++ b/Generators/MadGraphControl/python/MadGraphUtils.py
@@ -312,7 +312,7 @@ def new_process(process='generate p p > t t~\noutput -f', keepJpegs=False, usePM
         do_PMG_updates(process_dir)
 
     # After 2.9.3, enforce the standard default sde_strategy, so that this won't randomly change on the user
-    if is_version_or_newer([2,9,3]):
+    if is_version_or_newer([2,9,3]) and not is_NLO_run(process_dir=process_dir):
         mglog.info('Setting default sde_strategy to old default (1)')
         my_settings = {'sde_strategy':1}
         modify_run_card(process_dir=process_dir,settings=my_settings,skipBaseFragment=True)
-- 
GitLab