Merge branch 'lhcb-105c_LHCB_8' into 'LCG_105-patches'

SPI-2690: LCG_105c_LHCB_8

See merge request !2621

cmake/toolchain/heptools-105c_LHCB_8.cmake

+#---List of externals----------------------------------------------
+set(LCG_PYTHON_VERSION 3)
+include(heptools-105c)
+
+SET(LHCB_JSON_FILE https://gitlab.cern.ch/lhcb-core/rpm-recipes/-/raw/master/LHCBEXTERNALS/105/LHCBEXTERNALS_105c_LHCB_7.json)
+
+include(heptools-lhcbsetup)
+
+# generator versions from LHCB_7
+LCG_external_package(lhapdf            6.2.3p1              ${MCGENPATH}/lhapdf author=6.2.3 usecxxstd=1 )
+LCG_external_package(photos++          3.56.lhcb1           ${MCGENPATH}/photos++ author=3.56 hepmc=2 )
+LCG_external_package(pythia6           427.2.lhcb           ${MCGENPATH}/pythia6 author=6.4.27 hepevt=200000 )
+LCG_external_package(tauola++          1.1.6b.lhcb          ${MCGENPATH}/tauola++ author=1.1.6b hepmc=2)
+LCG_external_package(crmc              1.8.0.lhcb           ${MCGENPATH}/crmc author=1.8.0 hepmc=2)
+LCG_external_package(starlight         r313                 ${MCGENPATH}/starlight )
+LCG_external_package(madgraph5amc      2.9.3.atlas1         ${MCGENPATH}/madgraph5amc author=2.9.3)
+LCG_external_package(pythia8           244.lhcb4            ${MCGENPATH}/pythia8 author=244 )
+
+
+LCG_user_recipe(
+  superchic
+  URL https://lcgpackages.web.cern.ch/tarFiles/sources/MCGeneratorsTarFiles/superchic-v<superchic_<NATIVE_VERSION>_author>.tar.gz
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+               -DLHAPDF_DIR=${lhapdf_home} 
+               -DSUPERCHIC_ENABLE_TESTS=OFF
+               "-DCMAKE_Fortran_FLAGS=-ffree-line-length-none"  
+  DEPENDS lhapdf
+)
+
+
+
+LCG_external_package(superchic         5.1                  ${MCGENPATH}/superchic   author=5.1 )
+LCG_external_package(rivet             3.1.10               ${MCGENPATH}/rivet yoda=1.9.10 hepmc=2)
+LCG_external_package(yoda              1.9.10               ${MCGENPATH}/yoda)
+LCG_external_package(thepeg            2.2.3                ${MCGENPATH}/thepeg hepmc=2)
+LCG_external_package(herwig3           7.2.3p2              ${MCGENPATH}/herwig++  thepeg=2.2.3 madgraph=2.9.3.atlas1 openloops=2.1.1 lhapdf=6.2.3 author=7.2.3 hepmc=2)
+
+LIST(APPEND LHCB_TOP_PACKAGES superchic)
+
+LCG_top_packages(${LHCB_TOP_PACKAGES})

generators/Herwig3.cmake

@@ -69,7 +69,7 @@ if(LCG_ARCH MATCHES "aarch64" AND herwig3_native_version VERSION_GREATER 7.2.1)
 endif()
 LCGPackage_Add(
     herwig3
-    URL ${gen_url}/Herwig-<NATIVE_VERSION>.tar.bz2
+    URL ${gen_url}/Herwig-<herwig3_<NATIVE_VERSION>_author>.tar.bz2
     IF LCG_ARCH STREQUAL "aarch64" AND <NATIVE_VERSION> VERSION_LESS 7.2.2 THEN
        PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/herwig3-<NATIVE_VERSION>-aarch64.patch ENDIF
     ENVIRONMENT LD_LIBRARY_PATH=${thepeg_home}/lib/ThePEG/:\$ENV{LD_LIBRARY_PATH} 

generators/patches/herwig3-7.2.3p2.patch

+--- src/defaults/decayers.in.in.orig	2022-05-05 21:25:32.199240396 +0200
++++ src/defaults/decayers.in.in	2022-05-05 21:26:17.782163779 +0200
+@@ -24505,4 +24505,4 @@
+ newdef RadiativeHyperon:Points 10000
+ newdef RadiativeHyperon:GenerateIntermediates 0 
+ 
+-read EvtGenDecayer.in
++@LOAD_EVTGEN_DECAYER@
+--- MatrixElement/Hadron/MEDiffraction.cc.orig	2023-04-24 09:48:23.105931153 +0200
++++ MatrixElement/Hadron/MEDiffraction.cc	2023-04-24 09:51:16.124964250 +0200
+@@ -829,16 +829,19 @@
+ DescribeClass<MEDiffraction,HwMEBase>
+ describeHerwigMEDiffraction("Herwig::MEDiffraction", "HwMEHadron.so");
+ 
++// Apply patch reqested by ATLAS in SPI-2332 and taken from:
++// https://phab.hepforge.org/rHERWIGHGa43dab86f2a5f4e956eda9b2bad451d6ed664460
++
+ void MEDiffraction::persistentOutput(PersistentOStream & os) const {
+   os << theme2 << deltaOnly << diffDirection << theprotonPomeronSlope
+      << thesoftPomeronIntercept << thesoftPomeronSlope << dissociationDecay
+-     << ounit(theProtonMass,GeV) << MPIHandler_;
++     << ounit(theProtonMass,GeV) << MPIHandler_ << singleDiffractionOnly;
+ }
+ 
+ void MEDiffraction::persistentInput(PersistentIStream & is, int) {
+   is >> theme2 >> deltaOnly >> diffDirection >> theprotonPomeronSlope
+      >> thesoftPomeronIntercept >> thesoftPomeronSlope >> dissociationDecay
+-     >> iunit(theProtonMass,GeV)>> MPIHandler_;
++     >> iunit(theProtonMass,GeV)>> MPIHandler_ << singleDiffractionOnly;
+ }
+ 
+ InvEnergy2 MEDiffraction::protonPomeronSlope() const{
+--- MatrixElement/Matchbox/Matching/ShowerApproximation.h.orig	2023-06-02 16:43:47.462555108 +0200
++++ MatrixElement/Matchbox/Matching/ShowerApproximation.h	2023-06-02 16:44:56.368269080 +0200
+@@ -144,7 +144,7 @@
+   /**
+    * Return true, if this matching is capable of spin correlations.
+    */
+-  virtual bool hasSpinCorrelations() const { return false; }
++  virtual bool hasSpinCorrelations() const { return true; }
+ 
+ public:
+ 

generators/patches/lhapdf-6.2.3p1.patch

+--- bin/lhapdf.orig	2019-06-19 12:46:07.190871488 +0200
++++ bin/lhapdf	2019-06-19 12:46:12.070897902 +0200
+@@ -287,7 +287,7 @@
+         (by default lists all sets available for download; use --installed or --outdated to explore those installed on the current system)"""
+         ap = argparse.ArgumentParser(description=__doc__, usage="%(prog)s list [options] [pattern...]")
+         ap.add_argument("PATTERNS", nargs="*", help="patterns to match PDF sets against")
+-        ag = ap.add_add_mutually_exclusive_group()
++        ag = ap.add_mutually_exclusive_group()
+         ag.add_argument("--installed", dest="INSTALLED", action="store_true", help="list installed PDF sets")
+         ag.add_argument("--outdated", dest="OUTDATED", action="store_true", help="list installed, but outdated, PDF sets")
+         ap.add_argument("--codes", dest="CODES", action="store_true", help="additionally show ID codes")
+--- wrappers/python/lhapdf.pyx~	2017-08-28 14:14:14.000000000 +0200
++++ wrappers/python/lhapdf.pyx	2024-06-17 15:14:30.640245983 +0200
+@@ -525 +525 @@
+-           print "You can only set the flavor scheme to FIXED or VARIABLE"
++           print("You can only set the flavor scheme to FIXED or VARIABLE")
+@@ -531 +531 @@
+-           print "FIXED"
++           print("FIXED")
+@@ -533 +533 @@
+-           print "VARIABLE"
++           print("VARIABLE")

generators/patches/rivet-3.1.10.patch

+--- analyses/pluginATLAS/ATLAS_2023_I2663725.cc.orig	2024-02-16 15:51:04.947343208 +0100
++++ analyses/pluginATLAS/ATLAS_2023_I2663725.cc	2024-02-16 15:51:35.932316347 +0100
+@@ -5,6 +5,7 @@
+ #include "Rivet/Projections/DressedLeptons.hh"
+ #include "Rivet/Projections/PromptFinalState.hh"
+ #include "Rivet/Projections/InvisibleFinalState.hh"
++#include "Rivet/Projections/VetoedFinalState.hh"
+ 
+ namespace Rivet {
+