diff --git a/profiles/desc/lhapdf_sets.desc b/profiles/desc/lhapdf_sets.desc index 66da0763ce0..933f4a56d4d 100644 --- a/profiles/desc/lhapdf_sets.desc +++ b/profiles/desc/lhapdf_sets.desc @@ -5,10 +5,12 @@ nnpdf31_nnlo_as_0118_luxqed - NNPDF31_nnlo_as_0118_luxqed LHAPDF grid pdf4lhc15_nlo_asvar - PDF4LHC15_nlo_asvar LHAPDF grid +pdf4lhc15_nnlo_100 - PDF4LHC15_nnlo_100 LHAPDF grid ct14qed_proton - CT14qed_proton LHAPDF grid ct14lo - CT14lo LHAPDF grid ct14nlo - CT14nlo LHAPDF grid ct10 - CT10 LHAPDF grid +ct10nnlo - CT10nnlo LHAPDF grid mrst2007lomod - MRST2007lomod LHAPDF grid nnpdf23_nlo_as_0119_qed_mc - NNPDF23_nlo_as_0119_qed_mc LHAPDF grid nnpdf23_nnlo_as_0119_qed_mc - NNPDF23_nnlo_as_0119_qed_mc LHAPDF grid @@ -16,4 +18,4 @@ cteq66 - CTEQ66 LHAPDF grid cteq6l1 - CTEQ6L1 LHAPDF grid mrst2004qed - MRST2004qed LHAPDF grid nnpdf23_nlo_as_0118 - nnpdf23_nlo_as_0118 grid -nnpdf31_nnlo_as_0118 - nnpdf31_nnlo_as_0118 grid \ No newline at end of file +nnpdf31_nnlo_as_0118 - nnpdf31_nnlo_as_0118 grid diff --git a/sci-physics/lhapdf-sets/Manifest b/sci-physics/lhapdf-sets/Manifest index 6e1d343752e..d196093838c 100644 --- a/sci-physics/lhapdf-sets/Manifest +++ b/sci-physics/lhapdf-sets/Manifest @@ -1,4 +1,5 @@ DIST CT10.tar.gz 10246366 BLAKE2B f0daf0a3ca6cd2f178f993944cdc29de5deb1f441d197e47c8b1c285a56abc0fdb1cd53ec5a8e7736e200397bea9ec9cf4d04420ce206e5c396b85b63f695d00 SHA512 90406bd102ab54b683fa3e6f3fc759febea2454a0b96c6a8d373cdec297f5d652097057a015c7d87241792ed9b5d9ac658a33155cdd7362f59110f8f06ecce73 +DIST CT10nnlo.tar.gz 14226448 BLAKE2B a6949ad400ebc44753682feaa38936d37acc2912431b933c756626cba13ba3be6da3df2a4c7bce063fbe60babc69921157a67c0702290652bbd261979e3b8671 SHA512 3ae1659c38e291af39a8615d759a5c41ece1b7d622031b8b4c5118cff1c66b7ce6bd2593e2306628d09a9314eff04500a1d8fa899a4d0d84053cf1fb4e2bf673 DIST CT14lo.tar.gz 474954 BLAKE2B 60e8d3695fa64a997f0431516086f037d8843a9310cb52910c28a8a8960838409bafb280cf776b25fde1b31225743b72a48a3d467b1f7a4ff5478d515607645b SHA512 bc6acfcf522262da227411555f10dd73456fb5d0ab9db334b99cf7953463e1fa3de8c78bbb95269e9a47629860d906d43948e6cf1719b00402645ec18249f959 DIST CT14nlo.tar.gz 27067462 BLAKE2B b8d46593a62e80c320c76fb89f646ba0f31ab98811076120de1d21ef3b4849ff3d2e7b8d01d01dff5f1ee05a2266d94664e7f4a27347fa32c8ac4c68b0e72acb SHA512 1fcdfd24569966c1bc9c98f8ae2bf7d3a306700387b1351c92bc2b4f061db5d59d048c6cdd25095e1dc58344afa7f65a6526c611d747a5894398754483db77a2 DIST CT14qed_proton.tar.gz 11064380 BLAKE2B b0b5834473a90d2adfedfa4dd467847349fc1b60907d387d1007387dcf557fac37871ea7430161edc0ecf6f8e8839077283dc8fcad610f03dd192efd70890c3f SHA512 a41f6f82e5505f66014e5523210c272254fb8018bbfac542eb1941e60c1c897ee687bfef1afbd981132cb772240fdd4d19b5dcd2b36b01f8e34ea959d9acd4f7 @@ -10,5 +11,6 @@ DIST NNPDF23_nnlo_as_0119_qed_mc.tar.gz 28940412 BLAKE2B 57c7c98bb863258f87e236f DIST NNPDF31_nnlo_as_0118.tar.gz 43193739 BLAKE2B b826eaebb6483b844bc18cfca36be8ead1dc409641e445f8d31db58f31bde623b7e7753a94c0e2ee0dfe24b28909b9d06b17641a783c223d8ab7ce8e55902a5c SHA512 a62330979f4001933b52e2b1bd3142b4dacd27aeed1e49969108a842e00e7db59a7fe8d80b755c283f3bc706b36e3ec4597e124d95ad3a7f334fb956bebe7ae0 DIST NNPDF31_nnlo_as_0118_luxqed.tar.gz 47462442 BLAKE2B 2b473d943ec49e28de63d002e4eadfd3002c63aa6ef9b4e792adf7acf8bb3a771f91298ac6575034407653d15aa4191da6090aaaa34d8a8091cb1a5d4562479a SHA512 5faafc9a2b23dc0a82c7f3ca26a6691cfa476f83741beab2b41a77e63fa5f10428bf43579670636689c0080421f4b08ec058aa63c047f04f6d892b1b848fd702 DIST PDF4LHC15_nlo_asvar.tar.gz 578871 BLAKE2B a42a24d4af82f892e0dccfeeacedfcbb074be1ddc9649d55ff6c15e3923901173337ba4197248410d2a40e72ab627af9a0cea09e5ee98c37130aceb34402d9d4 SHA512 ef96970050b78f5a5bc54b43ee2d7ed0eb76796ea23ce864f1c8ff6de2d68f99023d5c4530f4e73197948c39886fcb832ed26dfa126ca0396e4fd08e353df8a0 +DIST PDF4LHC15_nnlo_100.tar.gz 29962423 BLAKE2B 0ea3e9d44e4a049fad871b66fe473ff51ce23b7957276f1e930796b5c3ca5e292f1faf9aee27b2e7a07c5af0b6762afd970faaa9d5f8b9d14311cef5339ee23f SHA512 b240c053fa6ce438d32c662457bcf20f1767d2b07d0375782c541e18f616e89a5ad27c5bb967f9273d953239d46c9ed64cd5c73467d4dc12e18f88d4853bb00b DIST cteq66.tar.gz 8647237 BLAKE2B 3ac47b6eee434f89ff329cfcb8268782af4ffa552ca4b412a59254e9b10410518f9fe9543b47f193d9cd31b06fc1101556df2be01c25ca17febcb9fb1855e5ca SHA512 25d0fa01dcdb59d71c7092367af8258471a2bc6dfd146766cc79f90ffb0feafa0f2011d0a37a7d75315c10ba7c7a6e3fa583d9c0a28119b072228ac800294e48 DIST cteq6l1.tar.gz 317834 BLAKE2B eccad131853f9a760d0dfd43a3f8705f8edbac3ec7373de9ef9a8936f13ba06500ba5758cd04649dd1b85ac04fc778e9d96222877e74e9ff02263455b233fa41 SHA512 7177608e97077eaf45a292db4ea74eb9a28b4b500ab8be02098b4837a5583cd397828abc3bf43ead448926eaa75ae3968bd059ecde333d90ed6e4295cbe1873c diff --git a/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild b/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild index 784d94f972e..ebaa3628e89 100644 --- a/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild +++ b/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild @@ -7,10 +7,12 @@ LHA_VER="6.2.1" IUSE_LHAPDF_SETS=" lhapdf_sets_nnpdf31_nnlo_as_0118_luxqed lhapdf_sets_pdf4lhc15_nlo_asvar + lhapdf_sets_pdf4lhc15_nnlo_100 lhapdf_sets_ct14qed_proton lhapdf_sets_ct14lo lhapdf_sets_ct14nlo lhapdf_sets_ct10 + lhapdf_sets_ct10nnlo lhapdf_sets_mrst2007lomod lhapdf_sets_nnpdf23_nlo_as_0119_qed_mc lhapdf_sets_nnpdf23_nnlo_as_0119_qed_mc @@ -21,6 +23,8 @@ IUSE_LHAPDF_SETS=" lhapdf_sets_nnpdf31_nnlo_as_0118 " +DESCRIPTION="LHAPDF data grids" +HOMEPAGE="https://lhapdf.hepforge.org/" COMMON_URI="https://lhapdfsets.web.cern.ch/lhapdfsets/current" HEPFORGE_URI="https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}" # Alternatively to fetching them here already the user can install them by lhapdf install, @@ -29,10 +33,12 @@ HEPFORGE_URI="https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_ SRC_URI=" lhapdf_sets_nnpdf31_nnlo_as_0118_luxqed? ( ${COMMON_URI}/NNPDF31_nnlo_as_0118_luxqed.tar.gz ) lhapdf_sets_pdf4lhc15_nlo_asvar? ( ${COMMON_URI}/PDF4LHC15_nlo_asvar.tar.gz ) + lhapdf_sets_pdf4lhc15_nnlo_100? ( ${COMMON_URI}/PDF4LHC15_nnlo_100.tar.gz ) lhapdf_sets_ct14qed_proton? ( ${COMMON_URI}/CT14qed_proton.tar.gz ) lhapdf_sets_ct14lo? ( ${COMMON_URI}/CT14lo.tar.gz ) lhapdf_sets_ct14nlo? ( ${COMMON_URI}/CT14nlo.tar.gz ) lhapdf_sets_ct10? ( ${COMMON_URI}/CT10.tar.gz ) + lhapdf_sets_ct10nnlo? ( ${COMMON_URI}/CT10nnlo.tar.gz ) lhapdf_sets_mrst2007lomod? ( ${COMMON_URI}/MRST2007lomod.tar.gz ) lhapdf_sets_nnpdf23_nlo_as_0119_qed_mc? ( ${COMMON_URI}/NNPDF23_nlo_as_0119_qed_mc.tar.gz ) lhapdf_sets_nnpdf23_nnlo_as_0119_qed_mc? ( ${COMMON_URI}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz ) @@ -46,15 +52,12 @@ SRC_URI=" MY_PV=$(ver_cut 1-3) MY_PF=LHAPDF-${MY_PV} -DESCRIPTION="LHAPDF data grids" -HOMEPAGE="https://lhapdf.hepforge.org/" -KEYWORDS="~amd64 ~x86" S="${WORKDIR}" - LICENSE="public-domain" + SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="${IUSE_LHAPDF_SETS}" -SLOT="0" RDEPEND="sci-physics/lhapdf" DEPEND="${RDEPEND}" diff --git a/sci-physics/openloops/Manifest b/sci-physics/openloops/Manifest index 9fa410972dd..19f9edccb60 100644 --- a/sci-physics/openloops/Manifest +++ b/sci-physics/openloops/Manifest @@ -1,4 +1,5 @@ DIST OpenLoops-OpenLoops-2.1.3.tar.bz2 3769562 BLAKE2B ddb664a7310662e2d0891e31870d614c191b0248f1b4c8816d4f33b6709005eea7435fda73c354092a28d55a0b106ec9358fb4e4a7a6ed592d61208ff5334e85 SHA512 a5ae2431506f8e169c42dd1d5fa3db70b4e2d62dfa744041fcd61d8554daba0700d453e9198e50a3e85cb3f196277c0f011fb408fd5913cd6a1c42ed71bb9d51 +DIST pplla_ew-0a26af9a.tar.bz2 1512376 BLAKE2B 363ff99624248ad24824272f6a3ced26b32d597880d70344dce2690a6eaf451e05ca76eeaafa6b36ba1deebe09f429dccdc774b52b778f9c824426d65ed28dfe SHA512 2858ae591eb372a26597f842d0ed3bf90fdb27e883db3a968e7c449fc569ec6fa28ecef11e4a6f9626596d9a391aff7a4f744bf46faa17b146958c3e09cc9a8a DIST ppllj-a3a36918.tar.bz2 475014 BLAKE2B b73022c23c082637eb2658fafab716eb749b87de5304ef6672552e7bbbb637a915d0f29c4dee352d9d6f18af7c4139047405bf031bf3986e7353fe73ac82903c SHA512 7ffb11b8910782a9316b86388a2de2d7ce7b9fdc2742bec8065f22a143cf1c988447480d10a629c4b820d5d8b1248bc10eab78560cd51b22fd3fe4a23b596b99 DIST pplljj-93a6e3f7.tar.bz2 2472469 BLAKE2B e4d22ff93ffcd3eaf2583ddfd107d75ecfca5abbcfc125d305f0a149b11b2c3784be95f3d2b473f7aee6c9819863f01bfbf3cd4b06dae8ed2ec6542f6acb1a62 SHA512 d52ee86f8b7aa5e6a339b82e0e6bd30eff5e6666ad3b1d33bc4c1122ef77dd986836abcc70b7936f10f66bd65e29dc938221da45c9654fcab2340085200c523a DIST pplnj_ckm-4d8743c.tar.bz2 399934 BLAKE2B dbbc0f9d832c9d1758bdf7166b1936c8ecb48053981d2f96fc7ba0bd4a740515863d6b07ab4a1ec1c88cc267787f9ee061ebfc812c4f457fa4a9d135f6df64e2 SHA512 fc4e5797412951a9144bda5856d14aec9d0d4b2f4a89d9afd2d97573149498d76cdc92b9b96915b7ebd318656d44ad9c3bfa0bd14dbb2bb871f665613156075e diff --git a/sci-physics/openloops/metadata.xml b/sci-physics/openloops/metadata.xml index a32ce734bcc..ebd5233b668 100644 --- a/sci-physics/openloops/metadata.xml +++ b/sci-physics/openloops/metadata.xml @@ -19,6 +19,7 @@ Build with collier Build libs with extra Build with cuttools + Build pp to lla process with EW corrections Build pp to llj process Build pp to lljj process Build pp to lnj process with ckm matrix diff --git a/sci-physics/openloops/openloops-2.1.3-r1.ebuild b/sci-physics/openloops/openloops-2.1.3-r2.ebuild similarity index 87% rename from sci-physics/openloops/openloops-2.1.3-r1.ebuild rename to sci-physics/openloops/openloops-2.1.3-r2.ebuild index ebe75037fc3..af10ffe9368 100644 --- a/sci-physics/openloops/openloops-2.1.3-r1.ebuild +++ b/sci-physics/openloops/openloops-2.1.3-r2.ebuild @@ -24,13 +24,14 @@ SRC_URI=" pplljj? ( ${COMMON_URI}/pplljj/-/archive/93a6e3f7/pplljj-93a6e3f7.tar.bz2 ) pplnj-ckm? ( ${COMMON_URI}/pplnj_ckm/-/archive/4d8743c/pplnj_ckm-4d8743c.tar.bz2 ) pplnjj-ckm? ( ${COMMON_URI}/pplnjj_ckm/-/archive/d3d5302/pplnjj_ckm-d3d5302.tar.bz2 ) + pplla-ew? ( ${COMMON_URI}/pplla_ew/-/archive/0a26af9a/pplla_ew-0a26af9a.tar.bz2 ) " S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="+collier +cuttools +extra ppllj pplljj pplnj-ckm pplnjj-ckm" +IUSE="+collier +cuttools +extra pplla-ew ppllj pplljj pplnj-ckm pplnjj-ckm" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -78,7 +79,7 @@ src_prepare() { src_compile() { escons --cache-disable - for OLPROC in ppllj pplljj pplnj_ckm pplnjj_ckm; do + for OLPROC in pplla_ew ppllj pplljj pplnj_ckm pplnjj_ckm; do if use ${OLPROC//_/-}; then # move downloaded files to src mkdir -p "${S}/process_src/${OLPROC}" || die @@ -92,7 +93,7 @@ src_compile() { cat <<-EOF >> openloops.cfg || die process_src_dir = ${EPREFIX}/opt/${MY_P}/process_src/ process_obj_dir = ${EPREFIX}/opt/${MY_P}/process_obj/ - process_lib_dir = ${EPREFIX}/usr/$(get_libdir)/ + process_lib_dir = ${EPREFIX}/opt/${MY_P}/proclib/ EOF } @@ -106,16 +107,14 @@ src_install() { cd ../lib || die dolib.so libolcommon.so* libopenloops.so* librambo.so* libtrred.so* + cd .. || die # install processes - if [ -d "../proclib" ]; then - cd ../proclib || die - dolib.so *.so - # also install the process info files - insinto /usr/$(get_libdir)/ - doins *.info + if [ -d "./proclib" ]; then + dodir "/opt/${MY_P}/proclib" + mv proclib/* "${ED}/opt/${MY_P}/proclib/" || die fi - cd ../lib_src/olcommon/mod || die + cd ./lib_src/olcommon/mod || die doheader *.mod cd ../../openloops/mod || die doheader *.mod @@ -135,5 +134,5 @@ src_install() { pkg_postinst() { elog "Install processes with openloops libinstall." - elog "They are installed in ${EPREFIX}/usr/$(get_libdir)/." + elog "They are installed in ${EPREFIX}/opt/${MY_P}/proclib/." }