diff --git a/cmake/toolchain/heptools-107a_ATLAS_3.cmake b/cmake/toolchain/heptools-107a_ATLAS_3.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..f9ed6ff6c5dde7ddf3d983aaf9d59192a207d157
--- /dev/null
+++ b/cmake/toolchain/heptools-107a_ATLAS_3.cmake
@@ -0,0 +1,95 @@
+#---List of externals----------------------------------------------
+# The layer request can be found in SPI-2753
+
+# force rebuild of cuda to pick up small fixes
+set(CUDA_REVISION 1)
+set(HEPMC_VERSION 3)
+
+include(heptools-107a)
+
+LCG_external_package(fjcontrib 1.101 )
+
+LCG_external_package(hepmc3 3.3.0 )
+
+LCG_external_package(gdb 16.2 )
+
+LCG_external_package(highfive 2.10.1 )
+
+LCG_external_package(hdf5 1.14.6 )
+LCG_external_package(hdf5_mpi 1.14.6 )
+
+LCG_external_package(ggvvamp 1.0.atlas1 ${MCGENPATH}/ggvvamp)
+LCG_external_package(qqvvamp 1.1.atlas1 ${MCGENPATH}/qqvvamp)
+
+LCG_external_package(thepeg 2.3.0 ${MCGENPATH}/thepeg hepmc=${HEPMC_VERSION})
+LCG_external_package(herwig3 7.3.0p1 ${MCGENPATH}/herwig++ thepeg=2.3.0 hepmc=${HEPMC_VERSION} author=7.3.0)
+
+LCG_external_package(openloops 2.1.4 ${MCGENPATH}/openloops )
+LCG_external_package(nlox 1.2.2.atlas7 ${MCGENPATH}/nlox )
+LCG_external_package(cln 1.3.7 )
+LCG_external_package(ginac 1.8.7 )
+LCG_external_package(collier 1.2.8 ${MCGENPATH}/collier)
+LCG_external_package(recola 2.2.4 ${MCGENPATH}/recola )
+LCG_external_package(recola_SM 2.2.3 ${MCGENPATH}/recola_SM )
+LCG_external_package(FORM 4.3.1 ${MCGENPATH}/FORM)
+LCG_external_package(vbfnlo 3.0 ${MCGENPATH}/vbfnlo hepmc=${HEPMC_VERSION})
+LCG_external_package(pythia8 313 ${MCGENPATH}/pythia8 author=313)
+LCG_external_package(sherpa 2.2.16 ${MCGENPATH}/sherpa hepmc=${HEPMC_VERSION} author=2.2.16 hepevt=200000)
+LCG_external_package(sherpa-openmpi 2.2.16.openmpi3 ${MCGENPATH}/sherpa hepmc=${HEPMC_VERSION} author=2.2.16 hepevt=200000)
+
+LCG_external_package(autograd 1.7.0 )
+LCG_external_package(spey 0.2.1 )
+LCG_external_package(contur 3.1.0 ${MCGENPATH}/contur )
+LCG_external_package(njet 2.1.1 ${MCGENPATH}/njet)
+LCG_external_package(geneva 1.0-rc3.atlas2 ${MCGENPATH}/geneva author=1.0-rc3 )
+LCG_external_package(superchic 5.4.1 ${MCGENPATH}/superchic author=5.4.1 )
+LCG_external_package(madgraph5amc 3.5.7.atlas11 ${MCGENPATH}/madgraph5amc author=3.5.7)
+LCG_external_package(mcfm 10.3.atlas ${MCGENPATH}/mcfm author=10.3)
+LCG_external_package(lhapdf 6.5.5 ${MCGENPATH}/lhapdf)
+
+LCG_external_package(yoda 2.1.0 ${MCGENPATH}/yoda )
+LCG_external_package(rivet 4.1.0 ${MCGENPATH}/rivet hepmc=${HEPMC_VERSION} author=4.1.0)
+
+LCG_external_package(kokkos 4.3.01 )
+LCG_external_package(pepper_kokkos 1.1.1 ${MCGENPATH}/pepper_kokkos )
+
+LCG_external_package(ROOT 6.34.04 CUDA=OFF author=6.34.04)
+
+LCG_external_package(cppcheck 2.16.0 )
+
+if(${LCG_COMP} MATCHES gcc)
+ LCG_external_package(cuda 12.4.1 full=12.4.1_550.54.15 )
+ LCG_external_package(cudnn 8.9.7.29 cuda=12 )
+ LCG_external_package(jax_cuda12_plugin 0.5.0 )
+ LCG_external_package(jax_cuda12_pjrt 0.5.0 )
+endif()
+
+LCG_remove_package(R)
+LCG_remove_package(rpy2)
+LCG_remove_package(DD4hep)
+LCG_remove_package(acts)
+LCG_remove_package(onnxruntime)
+LCG_remove_package(tf2onnx)
+
+set(mcgenerators chaplin apfel cln collier contur crmc evtgen geneva ginac HepMC herwig3 hijing hto4l hydjet lhapdf madgraph5amc nlox mcfm pepper_kokkos prophecy4f pyquen pythia6 pythia8 recola rivet SFGen superchic thep8i thepeg vbfnlo yoda ggvvamp qqvvamp)
+
+set(base_top_packages ${mcgenerators} AIDA auth_get_sso_cookie autopep8 beautifulsoup4 blas Boost boto3 botocore ccache chardet clhep coin3d coverage cppcheck cppgsl CppUnit cryptography cuda cudnn cx_oracle cycler Davix dcap decorator distro doxygen eigen entrypoints expat fastjet fjcontrib flake8 flake8_bugbear flake8_builtins fmt freetype Frontier_Client future git gperftools graphviz grpc GSL gssapi gtest hdf5 heaptrack HepPDT idna igprof importlib_metadata ipython java jmespath jsonmcpp kiwisolver lcgenv libaio libffi libm_aocl libsodium libunwind libxml2 libxslt lxml lz4 matplotlib maven mccabe mypy mysql oracle oracledb pandas pcre pip png pprof prophecy4f protobuf protobuf2 psutil pycodestyle pyflakes pygraphviz PyJWT pyqt5 pyquen pytest Python PyYAML Qt5 rangev3 rapidjson RELAX requests ROOT s3transfer scipy sherpa sherpa-openmpi six sqlalchemy sqlite starlight stomppy sympy tbb tiff urllib3 valgrind vdt wheel XercesC xrootd yamlcpp zeromq zipp zlib)
+
+# Remove kokkos and pepper_kokos for gcc14 as cuda 12 doesn't support gcc14
+if(${LCG_COMP}${LCG_COMPVERS} MATCHES gcc14)
+ list(REMOVE_ITEM base_top_packages kokkos pepper_kokkos)
+endif()
+
+if(LCG_ARCH MATCHES "aarch64")
+ list(REMOVE_ITEM base_top_packages nlox dcap protobuf2 pepper_kokkos mcfm)
+endif()
+
+if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL centos7)
+ list(REMOVE_ITEM base_top_packages dcap)
+endif()
+
+message("Final set of top_packages: ${base_top_packages}")
+
+LCG_top_packages(${base_top_packages})
+
+
diff --git a/cmake/toolchain/heptools-107a_ATLAS_4.cmake b/cmake/toolchain/heptools-107a_ATLAS_4.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..4d5cc4aa4b68344f8d5bc07865b603859391f1fb
--- /dev/null
+++ b/cmake/toolchain/heptools-107a_ATLAS_4.cmake
@@ -0,0 +1,94 @@
+#---List of externals----------------------------------------------
+# The layer request can be found in SPI-2753
+
+# force rebuild of cuda to pick up small fixes
+set(CUDA_REVISION 1)
+set(HEPMC_VERSION 2)
+
+include(heptools-107a)
+
+LCG_external_package(fjcontrib 1.101 )
+
+LCG_external_package(gdb 16.2 )
+
+LCG_external_package(highfive 2.10.1 )
+
+LCG_external_package(hdf5 1.14.6 )
+LCG_external_package(hdf5_mpi 1.14.6 )
+
+LCG_external_package(ggvvamp 1.0.atlas1 ${MCGENPATH}/ggvvamp)
+LCG_external_package(qqvvamp 1.1.atlas1 ${MCGENPATH}/qqvvamp)
+
+LCG_external_package(thepeg 2.3.0 ${MCGENPATH}/thepeg hepmc=${HEPMC_VERSION})
+LCG_external_package(herwig3 7.3.0p1 ${MCGENPATH}/herwig++ thepeg=2.3.0 hepmc=${HEPMC_VERSION} author=7.3.0)
+
+LCG_external_package(openloops 2.1.4 ${MCGENPATH}/openloops )
+LCG_external_package(nlox 1.2.2.atlas7 ${MCGENPATH}/nlox )
+LCG_external_package(cln 1.3.7 )
+LCG_external_package(ginac 1.8.7 )
+LCG_external_package(collier 1.2.8 ${MCGENPATH}/collier)
+LCG_external_package(recola 2.2.4 ${MCGENPATH}/recola )
+LCG_external_package(recola_SM 2.2.3 ${MCGENPATH}/recola_SM )
+LCG_external_package(FORM 4.3.1 ${MCGENPATH}/FORM)
+LCG_external_package(vbfnlo 3.0 ${MCGENPATH}/vbfnlo hepmc=${HEPMC_VERSION})
+LCG_external_package(pythia8 313 ${MCGENPATH}/pythia8 author=313)
+LCG_external_package(sherpa 2.2.16 ${MCGENPATH}/sherpa hepmc=${HEPMC_VERSION} author=2.2.16 hepevt=200000)
+LCG_external_package(sherpa-openmpi 2.2.16.openmpi3 ${MCGENPATH}/sherpa hepmc=${HEPMC_VERSION} author=2.2.16 hepevt=200000)
+
+LCG_external_package(autograd 1.7.0 )
+LCG_external_package(spey 0.2.1 )
+LCG_external_package(contur 3.1.0 ${MCGENPATH}/contur )
+LCG_external_package(njet 2.1.1 ${MCGENPATH}/njet)
+LCG_external_package(geneva 1.0-rc3.atlas2 ${MCGENPATH}/geneva author=1.0-rc3 )
+LCG_external_package(superchic 5.4.1 ${MCGENPATH}/superchic author=5.4.1)
+LCG_external_package(madgraph5amc 3.5.7.atlas11 ${MCGENPATH}/madgraph5amc author=3.5.7)
+LCG_external_package(mcfm 10.3.atlas ${MCGENPATH}/mcfm author=10.3)
+LCG_external_package(lhapdf 6.5.5 ${MCGENPATH}/lhapdf)
+
+LCG_external_package(yoda 1.9.7 ${MCGENPATH}/yoda )
+LCG_external_package(rivet 3.1.7 ${MCGENPATH}/rivet hepmc=${HEPMC_VERSION} author=3.1.7)
+
+LCG_external_package(kokkos 4.3.01 )
+LCG_external_package(pepper_kokkos 1.1.1 ${MCGENPATH}/pepper_kokkos )
+
+LCG_external_package(ROOT 6.34.04 CUDA=OFF author=6.34.04)
+
+LCG_external_package(cppcheck 2.16.0 )
+
+if(${LCG_COMP} MATCHES gcc)
+ LCG_external_package(cuda 12.4.1 full=12.4.1_550.54.15 )
+ LCG_external_package(cudnn 8.9.7.29 cuda=12 )
+ LCG_external_package(jax_cuda12_plugin 0.5.0 )
+ LCG_external_package(jax_cuda12_pjrt 0.5.0 )
+endif()
+
+LCG_remove_package(R)
+LCG_remove_package(rpy2)
+LCG_remove_package(DD4hep)
+LCG_remove_package(acts)
+LCG_remove_package(onnxruntime)
+LCG_remove_package(tf2onnx)
+
+set(mcgenerators chaplin apfel cln collier contur crmc evtgen geneva ginac HepMC herwig3 hijing hto4l hydjet lhapdf madgraph5amc mcfm nlox pepper_kokkos prophecy4f pyquen pythia6 pythia8 recola rivet SFGen superchic thep8i thepeg vbfnlo yoda ggvvamp qqvvamp)
+
+set(base_top_packages ${mcgenerators} AIDA auth_get_sso_cookie autopep8 beautifulsoup4 blas Boost boto3 botocore ccache chardet clhep coin3d coverage cppcheck cppgsl CppUnit cryptography cuda cudnn cx_oracle cycler Davix dcap decorator distro doxygen eigen entrypoints expat fastjet fjcontrib flake8 flake8_bugbear flake8_builtins fmt freetype Frontier_Client future git gperftools graphviz grpc GSL gssapi gtest hdf5 heaptrack HepPDT idna igprof importlib_metadata ipython java jmespath jsonmcpp kiwisolver lcgenv libaio libffi libm_aocl libsodium libunwind libxml2 libxslt lxml lz4 matplotlib maven mccabe mypy mysql oracle oracledb pandas pcre pip png pprof prophecy4f protobuf protobuf2 psutil pycodestyle pyflakes pygraphviz PyJWT pyqt5 pyquen pytest Python PyYAML Qt5 rangev3 rapidjson RELAX requests ROOT s3transfer scipy sherpa sherpa-openmpi six sqlalchemy sqlite starlight stomppy sympy tbb tiff urllib3 valgrind vdt wheel XercesC xrootd yamlcpp zeromq zipp zlib)
+
+# Remove kokkos and pepper_kokos for gcc14 as cuda 12 doesn't support gcc14
+if(${LCG_COMP}${LCG_COMPVERS} MATCHES gcc14)
+ list(REMOVE_ITEM base_top_packages kokkos pepper_kokkos)
+endif()
+
+list(REMOVE_ITEM base_top_packages pepper_kokkos)
+
+if(LCG_ARCH MATCHES "aarch64")
+ list(REMOVE_ITEM base_top_packages nlox dcap protobuf2 pepper_kokkos mcfm)
+endif()
+if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL centos7)
+ list(REMOVE_ITEM base_top_packages dcap)
+endif()
+
+message("Final set of top_packages: ${base_top_packages}")
+
+LCG_top_packages(${base_top_packages})
+
+
diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index 1b10d6692de5d19ea9c31d7061af6e6c117f4029..960af1c225091c0ce07647cea7da2f5f48f11e4f 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -69,6 +69,7 @@ if(NOT ${LCG_OS} MATCHES ubuntu)
LCG_external_package(auth_get_sso_cookie 2.4.0-1 )
endif()
LCG_external_package(autoconf 2.69 )
+LCG_external_package(autograd 1.7.0 )
LCG_external_package(automake 1.16.1 )
LCG_external_package(autopep8 2.3.1 )
LCG_external_package(awkward 2.6.7 )
@@ -804,6 +805,7 @@ LCG_external_package(sphinxcontrib_serializinghtml 1.1.5
LCG_external_package(sphinx_rtd_theme 0.5.1 )
LCG_external_package(sqlalchemy 2.0.16 )
LCG_external_package(sqlite 3320300 )
+LCG_external_package(spey 0.2.1 )
LCG_external_package(statsmodels 0.14.1 )
LCG_external_package(stevedore 3.3.0 )
LCG_external_package(stomppy 6.1.0 )
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index ff76666b7d7a6ec42cad144af43f4b6b5e4a0ab6..83a4a76ead408f7250dea613c3ff7941f78230e0 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -698,11 +698,13 @@ set(gdb_config_options "LDFLAGS=-L${Python_home}/lib -Wl,--rpath=${Python_home}/
LCGPackage_Add(
gdb
URL ${GenURL}/gdb-${gdb_native_version}.tar.gz
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> IF NOT ${gmp_home} STREQUAL TakenFromSystem THEN --with-gmp=${gmp_home} ENDIF --with-mpfr=${mpfr_home} --without-xxhash --with-python=${Python_home}/bin/python${Python_config_version_twodigit} ${gdb_config_options}
+ ENVIRONMENT "CFLAGS=-fPIC" "CXXFLAGS=-fPIC"
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-install-libiberty IF NOT ${gmp_home} STREQUAL TakenFromSystem THEN --with-gmp=${gmp_home} ENDIF --with-mpfr=${mpfr_home} --without-xxhash --with-python=${Python_home}/bin/python${Python_config_version_twodigit} ${gdb_config_options}
ENVIRONMENT LD_LIBRARY_PATH=${Python_home}/lib:\$ENV{LD_LIBRARY_PATH}
BUILD_COMMAND ${MAKE} V=1
INSTALL_COMMAND ${MAKE} install
DEPENDS texinfo Python gmp mpfr
+ REVISION 2
)
#---GSL----------------------------------------------------------------------------------------------
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index b0f96ba42278eaf68cbfff9e0336245f44c1eaea..11f9b15f0284f67454357a7a0b015974a1d5ccdb 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -130,14 +130,14 @@ LCG_add_test(root-dict-test
#---contur------------------------------------------------------------------------------
LCGPackage_Add(
contur
- URL ${GenURL}/contur-<VERSION>.tar.gz
+ URL ${gen_url}/contur-<VERSION>.tar.gz
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MakeSitePackagesDir}
COMMAND ${PYTHON} setup.py install ${PySetupOptions}
COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
BUILD_IN_SOURCE 1
- DEPENDS Python setuptools numpy scipy pandas configobj matplotlib tqdm pytest PyYAML pyslha scikitlearn click pathos uncertainties
+ DEPENDS Python setuptools numpy scipy pandas configobj matplotlib tqdm pytest PyYAML pyslha scikitlearn click pathos uncertainties spey
)
#---lhapdfsets--------------------------------------------------------------------------------------
@@ -210,6 +210,7 @@ LCGPackage_Add(
URL ${GenURL}/MCGeneratorsTarFiles/YODA-<NATIVE_VERSION>.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CXXFLAGS=-Wno-register
--with-boost=${Boost_home}
+ IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN --with-hdf5=${hdf5_home}/bin/h5cc --with-highfive=${highfive_home} ENDIF
#IF EXISTS "${ROOT_home}/" THEN
# --enable-root
# ROOTCONFIG=${ROOT_home}/bin/root-config
@@ -222,6 +223,7 @@ LCGPackage_Add(
INSTALL_COMMAND ${MAKE} install
BUILD_IN_SOURCE 1
DEPENDS Python future
+ IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN hdf5 highfive ENDIF
IF <VERSION> VERSION_LESS 1.6.0 THEN
Boost
ENDIF
@@ -246,7 +248,7 @@ LCGPackage_Add(
--with-yoda=${yoda_home}
--with-fjcontrib=${fjcontrib_home}
--disable-pdfmanual
- IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 THEN
+ IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 AND <rivet_<NATIVE_VERSION>_author> VERSION_LESS 4.1.0 THEN
--with-hdf5=${hdf5_home}/bin/h5cc
--with-highfive=${highfive_home}
ENDIF
@@ -258,7 +260,7 @@ LCGPackage_Add(
COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -P ${CMAKE_SOURCE_DIR}/cmake/scripts/StripLib.cmake
BUILD_IN_SOURCE 1
DEPENDS IF <rivet_<NATIVE_VERSION>_hepmc> EQUAL 2 THEN HepMC ELSE hepmc3 ENDIF
- IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 THEN hdf5 highfive ENDIF
+ IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 AND <rivet_<NATIVE_VERSION>_author> VERSION_LESS 4.1.0 THEN hdf5 highfive ENDIF
future
fastjet
Python swig
diff --git a/generators/patches/pythia8-310.atlas1.patch b/generators/patches/pythia8-310.atlas1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..76fe1c2700f28acff219ce3dd6fb55844c0bfd38
--- /dev/null
+++ b/generators/patches/pythia8-310.atlas1.patch
@@ -0,0 +1,80 @@
+The patch is requested here https://its.cern.ch/jira/browse/SPI-2625
+This is only applicable part of the patch, as it is applied now to pythia8-310
+--- src/SimpleTimeShower.cc.orig 2024-10-01 19:16:52.334413013 +0200
++++ src/SimpleTimeShower.cc 2024-10-01 19:17:50.812427185 +0200
+@@ -1322,6 +1322,47 @@
+ }
+ }
+
++ // Coloured resonance decays: check recoil strategy.
++ int iRes = partonSystemsPtr->getInRes(iSys);
++ if (iRec == 0 && iRes != 0 && event[iRes].colType() != 0) {
++ if (recoilStrategyRF == 1) {
++ // Recoil against the final-state colour partner.
++ for (int j = 0; j < sizeRec; ++j) {
++ if (j + sizeInNonRec != iOffset) {
++ int iRecNow = useSystems
++ ? partonSystemsPtr->getAll(iSys, j + sizeInNonRec) : j;
++ if (!event[iRecNow].isFinal()) continue;
++ if (colSign > 0 && event[iRad].acol() > 0
++ && event[iRad].acol() == event[iRecNow].col()) {
++ iRec = iRecNow;
++ break;
++ }
++ if (colSign < 0 && event[iRad].col() >0
++ && event[iRad].col() == event[iRecNow].acol()) {
++ iRec = iRecNow;
++ break;
++ }
++ }
++ }
++ } else {
++ // Recoil against nearest colour-singlet daughter
++ // by (p_i + p_j)^2 - (m_i + m_j)^2 = 2 (p_i p_j - m_i m_j).
++ double ppMin = LARGEM2;
++ for (int j = 0; j < sizeOut; ++j) {
++ if (j != i) {
++ int iRecNow = useSystems ? partonSystemsPtr->getOut(iSys, j) : j;
++ if (!event[iRecNow].isFinal() || event[iRecNow].colType() != 0) continue;
++ double ppNow = event[iRecNow].p() * event[iRad].p()
++ - event[iRecNow].m() * event[iRad].m();
++ if (ppNow < ppMin) {
++ iRec = iRecNow;
++ ppMin = ppNow;
++ }
++ }
++ }
++ }
++ }
++
+ // Resonance decays:
+ // other end to nearest recoiler in same system final state,
+ // by (p_i + p_j)^2 - (m_i + m_j)^2 = 2 (p_i p_j - m_i m_j).
+@@ -4072,6 +4113,7 @@
+ // Optional reweighting to dipole with decaying coloured (e.g., top) mother.
+ // Skip if ME corrections are already made (= first emission in many cases).
+ int iResMot = partonSystemsPtr->getInRes(iSysSel);
++
+ if (recoilStrategyRF > 1 && iResMot != 0 && event[iResMot].colType() != 0
+ && dipSel->MEtype == 0) {
+
+@@ -4085,7 +4127,9 @@
+
+ // Recoiler should now be a colour-neutral particle (i.e., W for t -> bW).
+ // (Allow triplet for exotic colour flows, eg 3 in 3->38 or 8->33bar.)
+- if (colourMatches && rec.colType() != 0) {
++ int recColType = rec.col() != 0 && rec.acol() != 0 ? 2 :
++ rec.col() != 0 ? 1 : rec.acol() != 0 ? -1 : 0;
++ if (colourMatches && recColType != 0) {
+ // Check if there are any singlets at all among the daughters.
+ int ird1 = event[iResMot].daughter1();
+ int ird2 = event[iResMot].daughter2();
+@@ -4096,7 +4140,7 @@
+ break;
+ }
+ }
+- if (foundSinglet || abs(rec.colType()) != 1) {
++ if (foundSinglet || abs(recColType) != 1) {
+ loggerPtr->ERROR_MSG("flawed recoiler identity",
+ " is " + to_string(rec.idAbs()));
+ colourMatches = false;
diff --git a/generators/patches/rivet-4.1.0.patch b/generators/patches/rivet-4.1.0.patch
new file mode 100644
index 0000000000000000000000000000000000000000..df43bea152996673bdd748d8ed0e45b91035c5b5
--- /dev/null
+++ b/generators/patches/rivet-4.1.0.patch
@@ -0,0 +1,11 @@
+--- pyext/build.py.in.orig 2025-03-08 18:13:54.177894787 +0100
++++ pyext/build.py.in 2025-03-08 18:19:17.317245192 +0100
+@@ -25,7 +25,7 @@
+ ## Include args
+ incargs = " ".join("-I{}".format(d) for d in incdirs)
+ incargs += " -I@prefix@/include"
+-incargs += " @HEPMC3CPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @YAML_CPP_CPPFLAGS@"
++incargs += " @HEPMC3CPPFLAGS@ @FASTJETCPPFLAGS@ @FJCONTRIBCPPFLAGS@ @YODACPPFLAGS@ @YAML_CPP_CPPFLAGS@"
+ incargs += " @CPPFLAGS@"
+ incargs += " -I" + sysconfig.get_config_var("INCLUDEPY")
+
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index ff4eefd325f7b87d767ee805b23896bcd3a7a1f8..796622efd44f4f884c87a0be4fc856de9cde725c 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -10697,3 +10697,30 @@ LCGPackage_Add(
BUILD_IN_SOURCE 1
DEPENDS Python setuptools numpy scipy Jinja2 pymadx pytransport
)
+
+#---autograd------------------------------------------------------------------
+LCGPackage_Add(
+ autograd
+ URL ${GenURL}/autograd-v<VERSION>.tar.gz
+ CONFIGURE_COMMAND <VOID>
+ BUILD_COMMAND <VOID>
+ INSTALL_COMMAND ${MakeSitePackagesDir}
+ COMMAND ${PYTHON} -m pip install ${PySetupOptions} --no-deps .
+ COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
+ BUILD_IN_SOURCE 1
+ DEPENDS Python pip setuptools numpy scipy
+)
+
+#---spey------------------------------------------------------------------
+LCGPackage_Add(
+ spey
+ URL ${GenURL}/spey-v<VERSION>.tar.gz
+ CONFIGURE_COMMAND <VOID>
+ BUILD_COMMAND <VOID>
+ INSTALL_COMMAND ${MakeSitePackagesDir}
+ COMMAND ${PYTHON} -m pip install ${PySetupOptions} --no-deps .
+ COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
+ BUILD_IN_SOURCE 1
+ DEPENDS Python pip setuptools numpy scipy autograd semantic_version tqdm requests
+)
+