From 6faaf32f16963a486a9edadb701efa2bfe8e890d Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 1 Dec 2021 15:54:41 +0100 Subject: [PATCH 1/7] external lib for HYDJET++ cms-sw/cmssw# #36316 --- cmssw-tool-conf.spec | 1 + hydjet2.spec | 20 ++++++++++++++++++++ hydjet2/doc.txt | 10 ++++++++++ scram-tools.file/tools/hydjet2/hydjet2.xml | 11 +++++++++++ 4 files changed, 42 insertions(+) create mode 100644 hydjet2.spec create mode 100644 hydjet2/doc.txt create mode 100644 scram-tools.file/tools/hydjet2/hydjet2.xml diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 43630a5d052..35550936d28 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -41,6 +41,7 @@ Requires: heppdt Requires: herwig Requires: herwig7 Requires: hydjet +Requires: hydjet2 Requires: ittnotify Requires: jemalloc Requires: jemalloc-debug diff --git a/hydjet2.spec b/hydjet2.spec new file mode 100644 index 00000000000..c24f5bc6e00 --- /dev/null +++ b/hydjet2.spec @@ -0,0 +1,20 @@ +### RPM external hydjet2 2.x.y + +Source: http://cern.ch/lokhtin/hydjet++/%{n}.tar.gz + +BuildRequires: cmake gmake + +Requires: pyquen pythia6 lhapdf root + + +%prep +%setup -q -n %{n} + +%build + +cmake . -DCMAKE_INSTALL_PREFIX=%i -DCMAKE_BUILD_TYPE=Release -DPYQUEN_DIR=${PYQUEN_ROOT} -DPYTHIA6_DIR=${PYTHIA6_ROOT} -DLHAPDF_ROOT_DIR=${LHAPDF_ROOT} -DROOTSYS=${ROOT_ROOT} +cmake --build . --clean-first -- %{makeprocesses} + +%install + +cmake --build . --target install -- %{makeprocesses} diff --git a/hydjet2/doc.txt b/hydjet2/doc.txt new file mode 100644 index 00000000000..f5f08b8eef0 --- /dev/null +++ b/hydjet2/doc.txt @@ -0,0 +1,10 @@ +- Requested, AddedBy: + @wouf + +- PR: + https://github.com/cms-sw/cmsdist/pull/5412 + +- Description: + {hydjet2} is event generator for simulation of relativistic heavy ion AA collisions as a superposition of the soft, hydro-type state and the hard, multi-parton state. +- Documentation + http://cern.ch/lokhtin/hydjet++/documentation/ diff --git a/scram-tools.file/tools/hydjet2/hydjet2.xml b/scram-tools.file/tools/hydjet2/hydjet2.xml new file mode 100644 index 00000000000..2a78062ece5 --- /dev/null +++ b/scram-tools.file/tools/hydjet2/hydjet2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + From 6c26a4d377a44e29fe61ebe93446244a3dca90e0 Mon Sep 17 00:00:00 2001 From: wouf Date: Wed, 1 Dec 2021 18:56:42 +0300 Subject: [PATCH 2/7] Update doc.txt --- hydjet2/doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydjet2/doc.txt b/hydjet2/doc.txt index f5f08b8eef0..f256df36d20 100644 --- a/hydjet2/doc.txt +++ b/hydjet2/doc.txt @@ -2,7 +2,7 @@ @wouf - PR: - https://github.com/cms-sw/cmsdist/pull/5412 + https://github.com/cms-sw/cmsdist/pull/7483 - Description: {hydjet2} is event generator for simulation of relativistic heavy ion AA collisions as a superposition of the soft, hydro-type state and the hard, multi-parton state. From fcac651b346d6c79535918d909d5850cce587073 Mon Sep 17 00:00:00 2001 From: wouf Date: Thu, 2 Dec 2021 18:18:17 +0300 Subject: [PATCH 3/7] Update hydjet2.spec --- hydjet2.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hydjet2.spec b/hydjet2.spec index c24f5bc6e00..4590b51f091 100644 --- a/hydjet2.spec +++ b/hydjet2.spec @@ -1,6 +1,7 @@ -### RPM external hydjet2 2.x.y +### RPM external hydjet2 2.4.3 + +Source: http://cern.ch/lokhtin/hydjet++/%{n}-%{realversion}.tar.gz -Source: http://cern.ch/lokhtin/hydjet++/%{n}.tar.gz BuildRequires: cmake gmake @@ -8,7 +9,7 @@ Requires: pyquen pythia6 lhapdf root %prep -%setup -q -n %{n} +%setup -q -n %{n}-%{realversion} %build From f6b91756c7cf7f8aeb79d1ed9034fcebffb93e7c Mon Sep 17 00:00:00 2001 From: wouf Date: Mon, 13 Dec 2021 23:11:53 +0300 Subject: [PATCH 4/7] Update hydjet2.spec --- hydjet2.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hydjet2.spec b/hydjet2.spec index 4590b51f091..9e405da0e08 100644 --- a/hydjet2.spec +++ b/hydjet2.spec @@ -19,3 +19,6 @@ cmake --build . --clean-first -- %{makeprocesses} %install cmake --build . --target install -- %{makeprocesses} + +mkdir -p %{i}/data/externals/hydjet2 +mv %{i}/share/* %{i}/data/externals/hydjet2 From c8f517498a26e38941d8b72f08bbf8f96ea61e32 Mon Sep 17 00:00:00 2001 From: wouf Date: Mon, 13 Dec 2021 23:13:11 +0300 Subject: [PATCH 5/7] Update hydjet2.xml --- scram-tools.file/tools/hydjet2/hydjet2.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scram-tools.file/tools/hydjet2/hydjet2.xml b/scram-tools.file/tools/hydjet2/hydjet2.xml index 2a78062ece5..cdc73ae09b9 100644 --- a/scram-tools.file/tools/hydjet2/hydjet2.xml +++ b/scram-tools.file/tools/hydjet2/hydjet2.xml @@ -2,8 +2,10 @@ - + + + From d593c4eecf3725adce49b04f13aa3755ca25a0e6 Mon Sep 17 00:00:00 2001 From: wouf Date: Tue, 14 Dec 2021 08:47:13 +0300 Subject: [PATCH 6/7] Update hydjet2.xml --- scram-tools.file/tools/hydjet2/hydjet2.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/scram-tools.file/tools/hydjet2/hydjet2.xml b/scram-tools.file/tools/hydjet2/hydjet2.xml index cdc73ae09b9..10b807be4c9 100644 --- a/scram-tools.file/tools/hydjet2/hydjet2.xml +++ b/scram-tools.file/tools/hydjet2/hydjet2.xml @@ -6,6 +6,7 @@ + From 4175cf6391fa99ff9d99bcd387c4a082c9430149 Mon Sep 17 00:00:00 2001 From: wouf Date: Tue, 14 Dec 2021 09:13:44 +0300 Subject: [PATCH 7/7] Update hydjet2.xml --- scram-tools.file/tools/hydjet2/hydjet2.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/scram-tools.file/tools/hydjet2/hydjet2.xml b/scram-tools.file/tools/hydjet2/hydjet2.xml index 10b807be4c9..e79a0d86393 100644 --- a/scram-tools.file/tools/hydjet2/hydjet2.xml +++ b/scram-tools.file/tools/hydjet2/hydjet2.xml @@ -11,4 +11,5 @@ +