Fixed nlojet++ make check PYTHONPATH, make clean

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

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: