[Sherpa] Update Sherpa to 2.2.16 and add Recola

collier.spec

@@ -20,8 +20,13 @@ cmake ../ \
 make -j1
 
 %install
-mkdir -p %{i}/lib %{i}/include
+mkdir -p %{i}/lib %{i}/include %{i}/cmake
 cp libcollier.a %{i}/lib
 cp modules/*.mod %{i}/include/
+cp collierConfig.cmake %{i}/cmake
+cp collierConfigVersion.cmake %{i}/cmake
+sed -i 's;^.*set(COLLIER_LIBRARY_DIR.*$;get_filename_component(COLLIER_LIBRARY_DIR "${CMAKE_CURRENT_LIST_DIR}/../lib" ABSOLUTE);' %{i}/cmake/collierConfig.cmake
+sed -i 's;^.*set(COLLIER_INCLUDE_DIR.*$;get_filename_component(COLLIER_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../include" ABSOLUTE);' %{i}/cmake/collierConfig.cmake
+
 
 

recola.spec

@@ -0,0 +1,23 @@
+### RPM external recola 1.5.0
+Source: https://recola.hepforge.org/downloads/%{n}-%{realversion}.tar.gz
+Requires: collier
+BuildRequires: cmake
+
+%define keep_archives true
+
+%prep
+%setup -q -n recola-%{realversion}
+
+%build
+rm -rf build && mkdir build
+cmake -S . -B build \
+  -DCMAKE_INSTALL_PREFIX=%{i} \
+  -Dcollier_path=${COLLIER_ROOT} \
+  -Dwith_smtests=ON
+cmake --build build %{makeprocesses}
+
+
+%install
+cmake --install build
+sed -i 's;^.*set(RECOLA_LIBRARY_DIR.*$;get_filename_component(RECOLA_LIBRARY_DIR "${CMAKE_CURRENT_LIST_DIR}/../../lib" ABSOLUTE);' %{i}/lib/cmake/recolaConfig.cmake
+sed -i 's;^.*set(RECOLA_INCLUDE_DIR.*$;get_filename_component(RECOLA_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include" ABSOLUTE);' %{i}/lib/cmake/recolaConfig.cmake

scram-tools.file/tools/recola/recola.xml

@@ -0,0 +1,8 @@
+<tool name="recola" version="@TOOL_VERSION@" revision="1">
+  <client>
+    <environment name="RECOLA_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$RECOLA_BASE/lib"/>
+    <environment name="INCLUDE" default="$RECOLA_BASE/include"/>
+  </client>
+  <use name="collier"/>
+</tool>

sherpa-2.2.10-hepmcshort.patch → sherpa-2.2.16-hepmcshort.patch

@@ -1,7 +1,8 @@
-diff -Naur a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
---- a/SHERPA/Main/Sherpa.C	2020-08-24 10:09:46.822502996 +0200
-+++ b/SHERPA/Main/Sherpa.C	2020-08-24 10:15:36.098836763 +0200
-@@ -294,21 +294,23 @@
+diff --git a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
+index 0a16d23..ecb58e0 100644
+--- a/SHERPA/Main/Sherpa.C
++++ b/SHERPA/Main/Sherpa.C
+@@ -300,21 +300,23 @@ bool Sherpa::GenerateOneEvent(bool reset)
  }
 
  #ifdef USING__HEPMC2
@@ -29,10 +30,11 @@ diff -Naur a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
    p_hepmc3->AddCrossSection(event, TotalXS(), TotalErr());
  }
  #endif
-diff -Naur a/SHERPA/Main/Sherpa.H b/SHERPA/Main/Sherpa.H
---- a/SHERPA/Main/Sherpa.H	2020-08-24 10:09:46.822502996 +0200
-+++ b/SHERPA/Main/Sherpa.H	2020-08-24 10:11:27.751754145 +0200
-@@ -54,10 +54,10 @@
+diff --git a/SHERPA/Main/Sherpa.H b/SHERPA/Main/Sherpa.H
+index 599178b..d654d2c 100644
+--- a/SHERPA/Main/Sherpa.H
++++ b/SHERPA/Main/Sherpa.H
+@@ -54,10 +54,10 @@ namespace SHERPA {
 
      bool GenerateOneEvent(bool reset=true);
  #ifdef USING__HEPMC2

sherpa.spec

@@ -1,16 +1,15 @@
-### RPM external sherpa 2.2.15
-Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz
-Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi
+### RPM external sherpa 2.2.16
+Source: git+https://gitlab.com/sherpa-team/sherpa.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi recola
 BuildRequires: mcfm swig autotools
-Patch0: sherpa-2.2.10-hepmcshort
-Patch1: sherpa-cpp20
+Patch0: sherpa-2.2.16-hepmcshort
 #Avoid calling setenv: https://gitlab.com/sherpa-team/sherpa/-/commit/6ead62d7a2758612f8965fb5b61df8c012cf9cae.diff
-Patch2: sherpa-setenv
+Patch1: sherpa-setenv
 
 %{!?without_openloops:Requires: openloops}
 
 %prep
-%setup -q -n SHERPA-MC-%{realversion}
+%setup -q -n sherpa-%{realversion}
 
 autoreconf -i --force
 
@@ -25,7 +24,6 @@ perl -p -i -e 's|-rdynamic||g' configure AddOns/Analysis/Scripts/Makefile.in
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 export PYTHON=$(which python3)
@@ -37,6 +35,7 @@ export PYTHON=$(which python3)
             --enable-pyext \
             --enable-ufo \
             ${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT} \
+            ${RECOLA_ROOT+--enable-recola=$RECOLA_ROOT} \
             --enable-mpi \
             --with-sqlite3=$SQLITE_ROOT \
             --enable-analysis \