From 68a0e29193e4d0e755ef1b7591c24ab6c35b9631 Mon Sep 17 00:00:00 2001
From: JohannesGaessler <johannesg@5d6.de>
Date: Tue, 11 Jul 2023 10:49:10 +0200
Subject: [PATCH] Fixed nlojet++ make check PYTHONPATH, make clean
---
v2.5/generators/nlojet++/interface/check/Makefile.am | 2 +-
.../nlojet++/interface/check/fnlo-compare-tables.py | 11 +++++++++--
.../{ => input}/InclusiveNJets_InclusiveJets_fix.wrm | 0
.../{ => input}/InclusiveNJets_InclusiveJets_flex.wrm | 0
.../interface/check/{ => input}/fix_NodeDensity.str | 0
.../interface/check/{ => input}/fix_NodesPerBin.str | 0
.../interface/check/{ => input}/flex_NodeDensity.str | 0
.../interface/check/{ => input}/flex_NodesPerBin.str | 0
8 files changed, 10 insertions(+), 3 deletions(-)
rename v2.5/generators/nlojet++/interface/check/{ => input}/InclusiveNJets_InclusiveJets_fix.wrm (100%)
rename v2.5/generators/nlojet++/interface/check/{ => input}/InclusiveNJets_InclusiveJets_flex.wrm (100%)
rename v2.5/generators/nlojet++/interface/check/{ => input}/fix_NodeDensity.str (100%)
rename v2.5/generators/nlojet++/interface/check/{ => input}/fix_NodesPerBin.str (100%)
rename v2.5/generators/nlojet++/interface/check/{ => input}/flex_NodeDensity.str (100%)
rename v2.5/generators/nlojet++/interface/check/{ => input}/flex_NodesPerBin.str (100%)
diff --git a/v2.5/generators/nlojet++/interface/check/Makefile.am b/v2.5/generators/nlojet++/interface/check/Makefile.am
index a4514907..b5a7792f 100644
--- a/v2.5/generators/nlojet++/interface/check/Makefile.am
+++ b/v2.5/generators/nlojet++/interface/check/Makefile.am
@@ -15,7 +15,7 @@ AUTOMAKE_OPTIONS = gnu
# perl script targets to check the package (distributed, but not installed)
#
dist_check_SCRIPTS = fnlo-nj-wrmtest.pl fnlo-nj-lotest.pl fnlo-nj-nlotest.pl fnlo-compare-tables.py
-TESTS_ENVIRONMENT = LIBDIR=$(libdir)
+TESTS_ENVIRONMENT = LIBDIR=$(libdir) PYTHONPATH=$(shell fnlo-tk-config --pythondir)
TESTS = $(dist_check_SCRIPTS)
# Additional clean up for check targets
diff --git a/v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py b/v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py
index 946e8ad0..3a17694a 100755
--- a/v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py
+++ b/v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py
@@ -13,10 +13,14 @@ SEEDS = [1000, 2000]
# fnlo.SetGlobalVerbosity(fnlo.DEBUG)
os.system("rm -rf output")
+os.system("ln -s input/InclusiveNJets_InclusiveJets_fix.wrm")
+os.system("ln -s input/InclusiveNJets_InclusiveJets_flex.wrm")
def generate_table(vartype: str, name: str, seed: int):
- os.system(f"ln -sf {vartype}_{name}.str InclusiveNJets.str")
+ os.system(f"ln -sf input/{vartype}_{name}.str InclusiveNJets.str")
+ print(f"Asserting that steering file InclusiveNJets.str exists")
+ assert os.path.exists("InclusiveNJets.str")
os.system(
"nlojet++ "
"--calculate "
@@ -27,7 +31,10 @@ def generate_table(vartype: str, name: str, seed: int):
"--max-event 10000 "
"--save-after 10000 "
)
- os.system(f"mv output/run-hhc-born-2jet.tab.gz output/{vartype}_{name}_{seed:06d}.tab.gz")
+ expected_outfile = "output/run-hhc-born-2jet.tab.gz"
+ print(f"Asserting that there is a table under {expected_outfile}")
+ assert os.path.exists(expected_outfile)
+ os.system(f"mv {expected_outfile} output/{vartype}_{name}_{seed:06d}.tab.gz")
for vartype in TYPES:
diff --git a/v2.5/generators/nlojet++/interface/check/InclusiveNJets_InclusiveJets_fix.wrm b/v2.5/generators/nlojet++/interface/check/input/InclusiveNJets_InclusiveJets_fix.wrm
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/InclusiveNJets_InclusiveJets_fix.wrm
rename to v2.5/generators/nlojet++/interface/check/input/InclusiveNJets_InclusiveJets_fix.wrm
diff --git a/v2.5/generators/nlojet++/interface/check/InclusiveNJets_InclusiveJets_flex.wrm b/v2.5/generators/nlojet++/interface/check/input/InclusiveNJets_InclusiveJets_flex.wrm
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/InclusiveNJets_InclusiveJets_flex.wrm
rename to v2.5/generators/nlojet++/interface/check/input/InclusiveNJets_InclusiveJets_flex.wrm
diff --git a/v2.5/generators/nlojet++/interface/check/fix_NodeDensity.str b/v2.5/generators/nlojet++/interface/check/input/fix_NodeDensity.str
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/fix_NodeDensity.str
rename to v2.5/generators/nlojet++/interface/check/input/fix_NodeDensity.str
diff --git a/v2.5/generators/nlojet++/interface/check/fix_NodesPerBin.str b/v2.5/generators/nlojet++/interface/check/input/fix_NodesPerBin.str
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/fix_NodesPerBin.str
rename to v2.5/generators/nlojet++/interface/check/input/fix_NodesPerBin.str
diff --git a/v2.5/generators/nlojet++/interface/check/flex_NodeDensity.str b/v2.5/generators/nlojet++/interface/check/input/flex_NodeDensity.str
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/flex_NodeDensity.str
rename to v2.5/generators/nlojet++/interface/check/input/flex_NodeDensity.str
diff --git a/v2.5/generators/nlojet++/interface/check/flex_NodesPerBin.str b/v2.5/generators/nlojet++/interface/check/input/flex_NodesPerBin.str
similarity index 100%
rename from v2.5/generators/nlojet++/interface/check/flex_NodesPerBin.str
rename to v2.5/generators/nlojet++/interface/check/input/flex_NodesPerBin.str
--
GitLab