[Sherpa] Update Sherpa to 2.2.16 and compile with HepMC3

scram-tools.file/tools/sherpa/sherpa.xml

@@ -15,6 +15,7 @@
   <runtime name="SHERPA_LIBRARY_PATH" value="$@TOOL_BASE@/lib/SHERPA-MC" type="path"/>
   <use name="root_cxxdefaults"/>
   <use name="HepMC"/>
+  <use name="HepMC3"/>
   <use name="lhapdf"/>
   <use name="qd"/>
   <use name="blackhat"/>

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
@@ -45,3 +47,4 @@ diff -Naur a/SHERPA/Main/Sherpa.H b/SHERPA/Main/Sherpa.H
  #endif
 
      double TotalXS();
+

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 hepmc3
 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,13 +24,13 @@ perl -p -i -e 's|-rdynamic||g' configure AddOns/Analysis/Scripts/Makefile.in
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 export PYTHON=$(which python3)
 ./configure --prefix=%i --enable-analysis --disable-silent-rules \
             --enable-fastjet=$FASTJET_ROOT \
             --enable-hepmc2=$HEPMC_ROOT \
+            --enable-hepmc3=$HEPMC3_ROOT \
             --enable-lhapdf=$LHAPDF_ROOT \
             --enable-blackhat=$BLACKHAT_ROOT \
             --enable-pyext \