diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake index c55131e97579c69cfca9afd78bb7dc4167513eae..d8f9ceee40885e493cb2ad36dcdbb3973a4aa708 100644 --- a/cmake/toolchain/heptools-dev-generators.cmake +++ b/cmake/toolchain/heptools-dev-generators.cmake @@ -32,10 +32,10 @@ if(NOT ${LCG_COMP} STREQUAL clang) LCG_external_package(mcfm 10.3.atlas ${MCGENPATH}/mcfm author=10.3) endif() -LCG_external_package(collier 1.2.5 ${MCGENPATH}/collier) +LCG_external_package(collier 1.2.8 ${MCGENPATH}/collier) LCG_external_package(syscalc 1.1.7 ${MCGENPATH}/syscalc) -LCG_external_package(madgraph5amc 3.5.4.atlas10 ${MCGENPATH}/madgraph5amc author=3.5.4) +LCG_external_package(madgraph5amc 3.5.5.atlas11 ${MCGENPATH}/madgraph5amc author=3.5.5) LCG_external_package(lhapdf 6.5.4 ${MCGENPATH}/lhapdf ) @@ -51,7 +51,7 @@ LCG_external_package(pythia8 312 ${MCGENPATH}/pythia8 auth LCG_external_package(looptools 2.15 ${MCGENPATH}/looptools) LCG_external_package(vbfnlo 3.0 ${MCGENPATH}/vbfnlo hepmc=${HEPMC_VERSION}) -LCG_external_package(FORM 4.1 ${MCGENPATH}/FORM) +LCG_external_package(FORM 4.3.1 ${MCGENPATH}/FORM) LCG_external_package(njet 2.1.1 ${MCGENPATH}/njet) LCG_external_package(qgraf 3.1.4 ${MCGENPATH}/qgraf) @@ -114,8 +114,8 @@ endif() LCG_external_package(ampt 2.26t9b_atlas ${MCGENPATH}/ampt author=2.26t9b ) -LCG_external_package(recola_SM 2.2.2 ${MCGENPATH}/recola_SM ) -LCG_external_package(recola 2.2.0 ${MCGENPATH}/recola ) +LCG_external_package(recola_SM 2.2.3 ${MCGENPATH}/recola_SM ) +LCG_external_package(recola 2.2.4 ${MCGENPATH}/recola ) if(${LCG_COMP} STREQUAL gcc AND (${LCG_COMPVERS} VERSION_LESS 9 OR ${LCG_COMPVERS} VERSION_EQUAL 62)) LCG_external_package(hjets 1.2 ${MCGENPATH}/hjets author=1.2) # error: ‘const class std::complex<ThePEG::Qty<std::ratio<0>, std::ratio<0>, std::ratio<0> > >’ has no member named ‘__rep’ diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index cb9bcf1c4dddadff02561070fc147234c715b6dc..e73d0f1e7fc4c3bb59ac3f439f582c3738a3eb3a 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1714,7 +1714,7 @@ LCGPackage_Add( -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dcollier_path=${collier_home}/lib -Dmodel=SM - #-Dmodelfile_path=${recola_SM_home}/lib + -Dmodelfile_path=${recola_SM_home} -Dwith_python3=ON -Dstatic=ON -DCMAKE_VERBOSE_MAKEFILE=ON diff --git a/generators/patches/madgraph5amc-3.5.5.atlas11.patch b/generators/patches/madgraph5amc-3.5.5.atlas11.patch new file mode 100644 index 0000000000000000000000000000000000000000..d23a8f59e2161e2aeed6a76786961afa1eb33854 --- /dev/null +++ b/generators/patches/madgraph5amc-3.5.5.atlas11.patch @@ -0,0 +1,1292 @@ +#COMMENT: All modifications to restrict cards to set ATLAS generator standards +--- models/sm/restrict_ckm.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_ckm.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,30 +16,30 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### + ## INFORMATION FOR WOLFENSTEIN + ################################### + Block Wolfenstein +- 1 2.253000e-01 # lamWS +- 2 8.080000e-01 # AWS +- 3 1.320000e-01 # rhoWS +- 4 3.410000e-01 # etaWS ++ 1 2.257000e-01 # lamWS ++ 2 8.140000e-01 # AWS ++ 3 1.350000e-01 # rhoWS ++ 4 3.490000e-01 # etaWS + + ################################### + ## INFORMATION FOR YUKAWA +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/sm/restrict_c_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_c_mass.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 1.550000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 1.550000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/sm/restrict_default.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_default.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/sm/restrict_lepton_masses.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_lepton_masses.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 5.110000e-04 # Me + 13 1.056600e-01 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 2.270000e-12 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 5.110000e-04 # yme + 13 1.056600e-01 # ymm + 15 1.777000e+00 # ymtau +--- models/sm/restrict_no_b_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_no_b_mass.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/sm/restrict_no_masses.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_no_masses.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.320000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +--- models/sm/restrict_no_tau_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_no_tau_mass.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,20 +16,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +--- models/sm/restrict_no_widths.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_no_widths.dat 2016-05-03 22:54:19.000000001 +0200 +@@ -16,7 +16,7 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 1.777000e+00 # MTA +--- models/sm/restrict_zeromass_ckm.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/sm/restrict_zeromass_ckm.dat 2016-05-03 22:54:20.000000001 +0200 +@@ -6,9 +6,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -16,30 +16,30 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### + ## INFORMATION FOR WOLFENSTEIN + ################################### + Block Wolfenstein +- 1 2.253000e-01 # lamWS +- 2 8.080000e-01 # AWS +- 3 1.320000e-01 # rhoWS +- 4 3.410000e-01 # etaWS ++ 1 2.257000e-01 # lamWS ++ 2 8.140000e-01 # AWS ++ 3 1.350000e-01 # rhoWS ++ 4 3.490000e-01 # etaWS + + ################################### + ## INFORMATION FOR YUKAWA +@@ -47,7 +47,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +--- models/loop_sm/restrict_ckm.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_ckm.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,30 +22,30 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### + ## INFORMATION FOR WOLFENSTEIN + ################################### + Block Wolfenstein +- 1 2.253000e-01 # lamWS +- 2 8.080000e-01 # AWS +- 3 1.320000e-01 # rhoWS +- 4 3.410000e-01 # etaWS ++ 1 2.257000e-01 # lamWS ++ 2 8.140000e-01 # AWS ++ 3 1.350000e-01 # rhoWS ++ 4 3.490000e-01 # etaWS + + ################################### + ## INFORMATION FOR YUKAWA +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_c_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_c_mass.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 1.550000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 1.550000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_default.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_default.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_lepton_masses.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_lepton_masses.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 5.110000e-04 # Me + 13 1.056600e-01 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 2.270000e-12 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 5.110000e-04 # yme + 13 1.056600e-01 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_no_b_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_no_b_mass.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM +- 15 1.777000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_no_masses.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_no_masses.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +--- models/loop_sm/restrict_no_tau_mass.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_no_tau_mass.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,20 +22,20 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +--- models/loop_sm/restrict_no_widths.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_no_widths.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -22,7 +22,7 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 1.777000e+00 # MTA +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.700000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_parallel_test.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_parallel_test.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -22,7 +22,7 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.620000e+00 # MB +- 6 1.743000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 1.777000e+00 # MTA +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 4.6200000e+00 # ymb +- 6 1.743000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 1.777000e+00 # ymtau +--- models/loop_sm/restrict_test.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_test.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -22,7 +22,7 @@ + Block MASS + 4 0.000000e+00 # MC + 5 4.700000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 1.777000e+00 # MTA +--- models/loop_sm/restrict_zeromass_ckm.dat 2015-10-26 02:18:52.000000001 +0100 ++++ models/loop_sm/restrict_zeromass_ckm.dat 2016-05-03 22:54:29.000000001 +0200 +@@ -12,9 +12,9 @@ + ## INFORMATION FOR SMINPUTS + ################################### + Block SMINPUTS +- 1 1.325070e+02 # aEWM1 +- 2 1.166390e-05 # Gf +- 3 1.180000e-01 # aS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS + + ################################### + ## INFORMATION FOR MASS +@@ -22,30 +22,30 @@ + Block MASS + 4 0.000000e+00 # MC + 5 0.000000e+00 # MB +- 6 1.730000e+02 # MT ++ 6 1.725000e+02 # MT + 11 0.000000e+00 # Me + 13 0.000000e+00 # MM + 15 0.000000e+00 # MTA +- 23 9.118800e+01 # MZ ++ 23 9.118760e+01 # MZ + 25 1.250000e+02 # MH + + ################################### + ## INFORMATION FOR DECAY + ################################### +-DECAY 6 1.491500E+00 ++DECAY 6 1.32000000E+00 + DECAY 15 0.000000e+00 +-DECAY 23 2.441404e+00 +-DECAY 24 2.047600e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 + DECAY 25 6.38233934e-03 + + ################################### + ## INFORMATION FOR WOLFENSTEIN + ################################### + Block Wolfenstein +- 1 2.253000e-01 # lamWS +- 2 8.080000e-01 # AWS +- 3 1.320000e-01 # rhoWS +- 4 3.410000e-01 # etaWS ++ 1 2.257000e-01 # lamWS ++ 2 8.140000e-01 # AWS ++ 3 1.350000e-01 # rhoWS ++ 4 3.490000e-01 # etaWS + + ################################### + ## INFORMATION FOR YUKAWA +@@ -53,7 +53,7 @@ + Block YUKAWA + 4 0.000000e+00 # ymc + 5 0.000000e+00 # ymb +- 6 1.730000e+02 # ymt ++ 6 1.725000e+02 # ymt + 11 0.000000e+00 # yme + 13 0.000000e+00 # ymm + 15 0.000000e+00 # ymtau +#COMMENT: disables central installation of libraries which fails on read-only file systems +--- madgraph/interface/loop_interface.py.orig 2018-05-01 10:19:36.391921213 +0300 ++++ madgraph/interface/loop_interface.py 2018-05-01 10:20:08.019974345 +0300 +@@ -23,7 +23,7 @@ + import re + + import madgraph +-from madgraph import MG4DIR, MG5DIR, MadGraph5Error ++from madgraph import MG4DIR, MG5DIR, MadGraph5Error, ReadWrite + import madgraph.interface.madgraph_interface as mg_interface + import madgraph.interface.extended_cmd as cmd + import madgraph.interface.launch_ext_program as launch_ext +@@ -503,6 +503,9 @@ + if (opt['ninja'] is None) or (os.path.isfile(pjoin(MG5DIR, opt['ninja'],'libninja.a'))): + return + ++ if not ReadWrite: ++ return ++ + logger.info("First output using loop matrix-elements has been detected. Now asking for loop reduction:", '$MG:BOLD') + to_install = self.ask('install', '0', ask_class=AskLoopInstaller, timeout=300, + path_msg=' ') + +#COMMENT: enables legacy standard for fortran compilation +--- vendor/CutTools/makefile.orig 2018-06-18 13:24:17.164637074 +0200 ++++ vendor/CutTools/makefile 2018-06-18 13:24:27.756740547 +0200 +@@ -9,7 +9,7 @@ + ifeq ($(wildcard ../make_opts), ../make_opts) + include ../make_opts + else +- FFLAGS = ++ FFLAGS = -std=legacy + FC=gfortran + endif + +#COMMENT: enables legacy standard for fortran compilation +--- vendor/IREGI/src/makefile_ML5_lib.orig 2018-07-09 13:33:48.546490615 +0200 ++++ vendor/IREGI/src/makefile_ML5_lib 2018-07-09 13:33:57.238573607 +0200 +@@ -5,7 +5,7 @@ + FFDIR=$(qcdlooppath)/ff + onelooppath=$(PWD)/oneloop + #FFLAGS=-O -g -ggdb -fno-automatic -fbounds-check -I$(onelooppath) # -fbounds-check is very useful in checking mermory error,-g is for debuging,-ggdb is for debuging special in gdb +-FFLAGS=-O -g -fPIC -I$(onelooppath) ++FFLAGS=-O -g -fPIC -I$(onelooppath) -std=legacy + obj= global.o funlib.o linear_algebra.o kinematics.o matrices.o matrix_base.o cmatrix_base.o mis_warp.o special_fun.o pave_reduce.o cpave_reduce.o si_reduce.o csi_reduce.o ti_reduce.o cti_reduce.o gti_reduce.o binary_tree.o IREGI4ML5_interface.o avh_olo_foriregi.o + olomod= avh_olo_foriregi.mod avh_olo_foriregi_dp_box.mod avh_olo_foriregi_dp_olog.mod avh_olo_foriregi_units.mod \ + avh_olo_foriregi_dp.mod avh_olo_foriregi_dp_boxc.mod avh_olo_foriregi_dp_prec.mod avh_olo_foriregi_version.mod \ +#COMMENT: allows explicit single-core compilation +--- madgraph/various/misc.py.orig 2018-04-29 15:59:44.000000000 +0200 ++++ madgraph/various/misc.py 2018-07-18 10:11:06.000000000 +0200 +@@ -469,6 +469,8 @@ + try: + if nb_core > 1: + cmd.append('-j%s' % nb_core) ++ if nb_core < 0: ++ cmd.append('-j1') + cmd += arg + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, cwd=cwd, **opt) + +#COMMENT: changes Requirements to JobFlavor for lxbatch compatibility +--- madgraph/various/cluster.py.orig 2020-02-03 16:49:15.391981789 +0100 ++++ madgraph/various/cluster.py 2020-02-03 16:50:03.040159965 +0100 +@@ -875,7 +875,7 @@ + """ + + if self.cluster_queue not in ['None', None]: +- requirement = 'Requirements = %s=?=True' % self.cluster_queue ++ requirement = '+JobFlavour = "%s"' % self.cluster_queue + else: + requirement = '' + +@@ -951,7 +951,7 @@ + """ + + if self.cluster_queue not in ['None', None]: +- requirement = 'Requirements = %s=?=True' % self.cluster_queue ++ requirement = '+JobFlavour = "%s"' % self.cluster_queue + else: + requirement = '' + +#COMMENT: adds ckm c mass restrict card for loop sm +--- /dev/null 2020-09-02 07:36:17.604620197 +0200 ++++ models/loop_sm/restrict_ckm_c_mass.dat 2020-09-02 13:18:03.083179993 +0200 +@@ -0,0 +1,59 @@ ++###################################################################### ++## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO ##################### ++###################################################################### ++ ++################################### ++### INFORMATION FOR LOOP ++#################################### ++Block loop ++ 1 9.118800e+01 # MU_R ++ ++################################### ++## INFORMATION FOR SMINPUTS ++################################### ++Block SMINPUTS ++ 1 1.32348905e+02 # aEWM1 ++ 2 1.16637000e-05 # Gf ++ 3 1.18400000e-01 # aS ++ ++################################### ++## INFORMATION FOR MASS ++################################### ++Block MASS ++ 4 1.550000e+00 # MC ++ 5 4.700000e+00 # MB ++ 6 1.725000e+02 # MT ++ 11 0.000000e+00 # Me ++ 13 0.000000e+00 # MM ++ 15 1.776820e+00 # MTA ++ 23 9.118760e+01 # MZ ++ 25 1.250000e+02 # MH ++ ++################################### ++## INFORMATION FOR DECAY ++################################### ++DECAY 6 1.32000000E+00 ++DECAY 15 0.000000e+00 ++DECAY 23 2.49520000e+00 ++DECAY 24 2.085000e+00 ++DECAY 25 6.38233934e-03 ++ ++################################### ++## INFORMATION FOR WOLFENSTEIN ++################################### ++Block Wolfenstein ++ 1 2.257000e-01 # lamWS ++ 2 8.140000e-01 # AWS ++ 3 1.350000e-01 # rhoWS ++ 4 3.490000e-01 # etaWS ++ ++################################### ++## INFORMATION FOR YUKAWA ++################################### ++Block YUKAWA ++ 4 1.550000e+00 # ymc ++ 5 4.700000e+00 # ymb ++ 6 1.725000e+02 # ymt ++ 11 0.000000e+00 # yme ++ 13 0.000000e+00 # ymm ++ 15 1.777000e+00 # ymtau +#COMMENT: demotes ‘raise’ to critical warning +--- madgraph/various/banner.py.orig 2021-05-31 16:48:08.000000001 +0200 ++++ madgraph/various/banner.py 2021-08-12 19:36:07.000000001 +0200 +@@ -4219,7 +4219,8 @@ + # for lepton-lepton collisions, ignore 'pdlabel' and 'lhaid' + if abs(self['lpp1'])!=1 or abs(self['lpp2'])!=1: + if self['lpp1'] == 1 or self['lpp2']==1: +- raise InvalidRunCard('Process like Deep Inelastic scattering not supported at NLO accuracy.') ++ logger.critical("Such type of computation are normally forbidden within the official version of MG5aMC. Use at your own risk. The authors of MG5aMC will not provide any support on such run and the result of such run might not be reproducible in the version of the code supporting officially such computation.") ++# raise InvalidRunCard('Process like Deep Inelastic scattering not supported at NLO accuracy.') + + if self['pdlabel']!='nn23nlo' or self['reweight_pdf']: + self['pdlabel']='nn23nlo' +#COMMENT: StdHep and CutTools compilation +--- bin/.compile.py.orig 2021-08-12 19:43:58.000000001 +0200 ++++ bin/.compile.py 2021-08-12 19:26:33.000000001 +0200 +@@ -26,7 +26,7 @@ + root_path = os.path.split(os.path.dirname(os.path.realpath( __file__ )))[0] + sys.path.append(root_path) + +-from madgraph import MG5DIR ++from madgraph import MG5DIR, MadGraph5Error + import madgraph.iolibs.import_v4 as import_v4 + import madgraph.interface.master_interface as interface + import models.import_ufo as import_ufo +@@ -58,10 +58,14 @@ + if self.autorun: + self.make_UFO_pkl() + self.make_v4_pkl() +- self.make_stdHep() ++ try: ++ self.make_stdHep() ++ except MadGraph5Error: ++ print("WARNING: StdHep failed to compile. This forbids to run NLO+PS with PY6 and Herwig6.") + self.make_CutTools() + self.make_IREGI() +- self.install_package(ext_programs) ++ if ext_programs: ++ self.install_package(ext_programs) + self.test_output_LO() + self.test_output_NLO() + self.precompilation(debug=True) +@@ -169,7 +173,7 @@ + text = text.replace(base,compiler) + open(path, 'w').writelines(text) + +- misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'StdHEP')) ++ misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'StdHEP'), nb_core=-1) + + @staticmethod + def make_CutTools(): +@@ -191,7 +195,7 @@ + text = text.replace(base,compiler) + open(path, 'w').writelines(text) + +- misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'CutTools')) ++ misc.compile(cwd = os.path.join(MG5DIR, 'vendor', 'CutTools'), nb_core=-1) + + @staticmethod + def make_IREGI(): +@@ -275,7 +279,7 @@ + open(name,'w').write('\n'.join(lines)) + mod = False + +- misc.compile(cwd = os.path.join(iregi_path,'src')) ++ misc.compile(cwd = os.path.join(iregi_path,'src'), nb_core=-1) + + def install_package(self, programs=[]): + print("installing external package") +#COMMENT: config file mods +--- input/mg5_configuration.txt.orig 2021-05-31 16:48:15.000000001 +0200 ++++ input/mg5_configuration.txt 2021-08-12 20:19:07.000000001 +0200 +@@ -90,7 +90,7 @@ + #! Control when MG5 checks if he is up-to-date. + #! Enter the number of day between two check (0 means never) + #! A question is always asked before any update +-# auto_update = 7 ++auto_update = 0 + + ################################################################################ + # INFO FOR MADEVENT / aMC@NLO +@@ -101,7 +101,7 @@ + + #! Allow/Forbid the automatic opening of the web browser (on the status page) + #! when launching MadEvent [True/False] +-# automatic_html_opening = True ++automatic_html_opening = False + #! allow notification of finished job in the notification center (Mac Only) + # notification_center = True + +@@ -169,8 +169,8 @@ + + #! lhapdf-config --can be specify differently depending of your python version + #! If None: try to find one available on the system +-# lhapdf_py2 = lhapdf-config +-# lhapdf_py3 = lhapdf-config ++lhapdf_py2 = @lhapdf@ ++lhapdf_py3 = @lhapdf@ + + #! fastjet-config + #! If None: try to find one available on the system +@@ -206,24 +206,24 @@ + #! Set the Ninja directory containing ninja's library + #! if '' or None: disabling ninja + #! if ninja=/PATH/TO/ninja/lib: use that specific installation path for ninja +-# ninja = ./HEPTools/lib ++ninja = @ninja@ + + #! Set the COLLIER directory containing COLLIER's library + #! if '' or None: disabling COLLIER + #! if ninja=/PATH/TO/ninja/lib: use that specific installation path for COLLIER + # Note that it is necessary that you have generated a static library for COLLIER +-# collier = ./HEPTools/lib ++collier = @collier@ + + #! Set how MadLoop dependencies (such as CutTools) should be handled + #! > external : ML5 places a link to the MG5_aMC-wide libraries + #! > internal : ML5 copies all dependencies in the output so that it is independent + #! > environment_paths : ML5 searches for the dependencies in your environment path +-# output_dependencies = external ++output_dependencies = internal + + #! SysCalc PATH + #! Path to the directory containing syscalc executables + #! relative path start from main directory +-# syscalc_path = ./SysCalc ++syscalc_path = @syscalc@ + + #! Absolute paths to the config script in the bin directory of PineAPPL + #! (to generate PDF-independent fast-interpolation grids). +#COMMENT: config file mods +--- input/.mg5_configuration_default.txt.orig 2021-05-31 16:48:08.000000001 +0200 ++++ input/.mg5_configuration_default.txt 2021-08-12 20:19:26.000000001 +0200 +@@ -90,7 +90,7 @@ + #! Control when MG5 checks if he is up-to-date. + #! Enter the number of day between two check (0 means never) + #! A question is always asked before any update +-# auto_update = 7 ++auto_update = 0 + + ################################################################################ + # INFO FOR MADEVENT / aMC@NLO +@@ -101,7 +101,7 @@ + + #! Allow/Forbid the automatic opening of the web browser (on the status page) + #! when launching MadEvent [True/False] +-# automatic_html_opening = True ++automatic_html_opening = False + #! allow notification of finished job in the notification center (Mac Only) + # notification_center = True + +@@ -169,8 +169,8 @@ + + #! lhapdf-config --can be specify differently depending of your python version + #! If None: try to find one available on the system +-# lhapdf_py2 = lhapdf-config +-# lhapdf_py3 = lhapdf-config ++lhapdf_py2 = @lhapdf@ ++lhapdf_py3 = @lhapdf@ + + #! fastjet-config + #! If None: try to find one available on the system +@@ -206,24 +206,24 @@ + #! Set the Ninja directory containing ninja's library + #! if '' or None: disabling ninja + #! if ninja=/PATH/TO/ninja/lib: use that specific installation path for ninja +-# ninja = ./HEPTools/lib ++ninja = @ninja@ + + #! Set the COLLIER directory containing COLLIER's library + #! if '' or None: disabling COLLIER + #! if ninja=/PATH/TO/ninja/lib: use that specific installation path for COLLIER + # Note that it is necessary that you have generated a static library for COLLIER +-# collier = ./HEPTools/lib ++collier = @collier@ + + #! Set how MadLoop dependencies (such as CutTools) should be handled + #! > external : ML5 places a link to the MG5_aMC-wide libraries + #! > internal : ML5 copies all dependencies in the output so that it is independent + #! > environment_paths : ML5 searches for the dependencies in your environment path +-# output_dependencies = external ++output_dependencies = internal + + #! SysCalc PATH + #! Path to the directory containing syscalc executables + #! relative path start from main directory +-# syscalc_path = ./SysCalc ++syscalc_path = @syscalc@ + + #! Absolute paths to the config script in the bin directory of PineAPPL + #! (to generate PDF-independent fast-interpolation grids). +--- PLUGIN/__init__.py.orig 2022-11-10 10:11:59.803628175 +0100 ++++ PLUGIN/__init__.py 2022-11-10 10:12:23.504890776 +0100 +@@ -0,0 +1,6 @@ ++import os ++ ++root_path = os.path.split(os.path.dirname(os.path.realpath( __file__ )))[0] ++ ++__path__ = [ root_path , '/cvmfs/atlas.cern.ch/repo/sw/Generators/madgraph/models/latest/PLUGIN' ] ++ + +--- bin/mg5_aMC.orig ++++ bin/mg5_aMC +@@ -161,12 +161,13 @@ if options.plugin: + if not os.path.exists(os.path.join(root_path, 'PLUGIN', options.plugin)): + try: + __import__('MG5aMC_PLUGIN.%s' % options.plugin) ++ plugin = sys.modules['MG5aMC_PLUGIN.%s' % options.plugin] + except: + print( "ERROR: %s is not present in the PLUGIN directory. Please install it first" % options.plugin) +- ++ sys.exit() + else: + __import__('PLUGIN.%s' % options.plugin) +- plugin = sys.modules['PLUGIN.%s' % options.plugin] ++ plugin = sys.modules['PLUGIN.%s' % options.plugin] + if not plugin.new_interface: + logging.warning("Plugin: %s do not define dedicated interface and should be used without the --mode options" % options.plugin) + sys.exit()