-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d906524
commit fd43ec8
Showing
12 changed files
with
428 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
ubuntu2204/0001-CMake-allow-finding-newer-versions-of-podio.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| From 76bbcc713a5ef93502b23ed59a68f96dd87318b6 Mon Sep 17 00:00:00 2001 | ||
| From: Andre Sailer <[email protected]> | ||
| Date: Mon, 24 Jun 2024 15:51:35 +0200 | ||
| Subject: [PATCH] CMake: allow finding newer versions of podio | ||
|
|
||
| --- | ||
| CMakeLists.txt | 8 +++++++- | ||
| 1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index e80779bb..50d167c2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -155,7 +155,13 @@ endif() | ||
|
|
||
| if(DD4HEP_USE_EDM4HEP) | ||
| find_package(EDM4HEP REQUIRED) | ||
| - find_package(podio 0.16.3 REQUIRED) | ||
| + # we need podio with Frame support (>=0.16.3) | ||
| + # podio is "SameMajorVersion" compatible | ||
| + find_package(podio 0.16.3) # this will not find 1.0 and newer | ||
| + if(NOT podio_FOUND) | ||
| + # we try to find a newer version now | ||
| + find_package(podio 1.0 REQUIRED) | ||
| + endif() | ||
| # DD4HEP_SETUP_EDM4HEP_TARGETS() | ||
| endif() | ||
|
|
||
| -- | ||
| 2.39.3 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
ubuntu2204_clang/0001-CMake-allow-finding-newer-versions-of-podio.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| From 76bbcc713a5ef93502b23ed59a68f96dd87318b6 Mon Sep 17 00:00:00 2001 | ||
| From: Andre Sailer <[email protected]> | ||
| Date: Mon, 24 Jun 2024 15:51:35 +0200 | ||
| Subject: [PATCH] CMake: allow finding newer versions of podio | ||
|
|
||
| --- | ||
| CMakeLists.txt | 8 +++++++- | ||
| 1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index e80779bb..50d167c2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -155,7 +155,13 @@ endif() | ||
|
|
||
| if(DD4HEP_USE_EDM4HEP) | ||
| find_package(EDM4HEP REQUIRED) | ||
| - find_package(podio 0.16.3 REQUIRED) | ||
| + # we need podio with Frame support (>=0.16.3) | ||
| + # podio is "SameMajorVersion" compatible | ||
| + find_package(podio 0.16.3) # this will not find 1.0 and newer | ||
| + if(NOT podio_FOUND) | ||
| + # we try to find a newer version now | ||
| + find_package(podio 1.0 REQUIRED) | ||
| + endif() | ||
| # DD4HEP_SETUP_EDM4HEP_TARGETS() | ||
| endif() | ||
|
|
||
| -- | ||
| 2.39.3 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| From 09ef584f1ca797d84c1c0af18ec06b33d6c0d2d0 Mon Sep 17 00:00:00 2001 | ||
| From: Paul Gessinger <[email protected]> | ||
| Date: Thu, 24 Mar 2022 16:08:26 +0100 | ||
| Subject: [PATCH] fixes for C++20 build | ||
|
|
||
| --- | ||
| include/Pythia8/SusyLesHouches.h | 6 +++--- | ||
| src/HadronWidths.cc | 8 ++++---- | ||
| src/NucleonExcitations.cc | 8 ++++---- | ||
| src/PythiaParallel.cc | 2 +- | ||
| 4 files changed, 12 insertions(+), 12 deletions(-) | ||
|
|
||
| diff --git a/include/Pythia8/SusyLesHouches.h b/include/Pythia8/SusyLesHouches.h | ||
| index 2f1d9fd..5090c00 100644 | ||
| --- a/include/Pythia8/SusyLesHouches.h | ||
| +++ b/include/Pythia8/SusyLesHouches.h | ||
| @@ -28,7 +28,7 @@ namespace Pythia8 { | ||
| public: | ||
|
|
||
| //Constructor. | ||
| - LHblock<T>() : idnow(0), qDRbar(), i(), val() {} ; | ||
| + LHblock() : idnow(0), qDRbar(), i(), val() {} ; | ||
|
|
||
| //Does block exist? | ||
| bool exists() { return int(entry.size()) == 0 ? false : true ; }; | ||
| @@ -129,7 +129,7 @@ namespace Pythia8 { | ||
| template <int size> class LHmatrixBlock { | ||
| public: | ||
| //Constructor. Set uninitialized and explicitly zero. | ||
| - LHmatrixBlock<size>() : entry(), qDRbar(), val() { | ||
| + LHmatrixBlock() : entry(), qDRbar(), val() { | ||
| initialized=false; | ||
| for (i=1;i<=size;i++) { | ||
| for (j=1;j<=size;j++) { | ||
| @@ -208,7 +208,7 @@ namespace Pythia8 { | ||
| template <int size> class LHtensor3Block { | ||
| public: | ||
| //Constructor. Set uninitialized and explicitly zero. | ||
| - LHtensor3Block<size>() : entry(), qDRbar(), val() { | ||
| + LHtensor3Block() : entry(), qDRbar(), val() { | ||
| initialized=false; | ||
| for (i=1;i<=size;i++) { | ||
| for (j=1;j<=size;j++) { | ||
| diff --git a/src/HadronWidths.cc b/src/HadronWidths.cc | ||
| index ccc5c72..95a5cb1 100644 | ||
| --- a/src/HadronWidths.cc | ||
| +++ b/src/HadronWidths.cc | ||
| @@ -867,7 +867,7 @@ double HadronWidths::psSize(double eCM, ParticleDataEntryPtr prodA, | ||
| return 0.; | ||
|
|
||
| // Integrate mass of A. | ||
| - auto f = [=](double mA) { | ||
| + auto f = [=,this](double mA) { | ||
| return pow(pCMS(eCM, mA, m0B), lType) * mDistr(idA, mA); }; | ||
| if (!integrateGauss(result, f, mMinA, min(mMaxA, eCM - m0B))) | ||
| success = false; | ||
| @@ -879,7 +879,7 @@ double HadronWidths::psSize(double eCM, ParticleDataEntryPtr prodA, | ||
| return 0.; | ||
|
|
||
| // Integrate mass of B. | ||
| - auto f = [=](double mB) { | ||
| + auto f = [=,this](double mB) { | ||
| return pow(pCMS(eCM, m0A, mB), lType) * mDistr(idB, mB); }; | ||
| if (!integrateGauss(result, f, mMinB, min(mMaxB, eCM - m0A))) | ||
| success = false; | ||
| @@ -891,10 +891,10 @@ double HadronWidths::psSize(double eCM, ParticleDataEntryPtr prodA, | ||
| return 0.; | ||
|
|
||
| // Define integrand of outer integral. | ||
| - auto I = [=, &success](double mA) { | ||
| + auto I = [=, &success, this](double mA) { | ||
|
|
||
| // Define integrand of inner integral. | ||
| - auto f = [=](double mB) { | ||
| + auto f = [=,this](double mB) { | ||
| return pow(pCMS(eCM, mA, mB), lType) | ||
| * mDistr(idA, mA) * mDistr(idB, mB); }; | ||
| double res; | ||
| diff --git a/src/NucleonExcitations.cc b/src/NucleonExcitations.cc | ||
| index b5eef8f..a82383a 100644 | ||
| --- a/src/NucleonExcitations.cc | ||
| +++ b/src/NucleonExcitations.cc | ||
| @@ -502,7 +502,7 @@ double NucleonExcitations::psSize(double eCM, ParticleDataEntry& prodA, | ||
| return 0.; | ||
|
|
||
| // Integrate mass of A. | ||
| - auto f = [=](double mA) { | ||
| + auto f = [=, this](double mA) { | ||
| return pCMS(eCM, mA, m0B) * hadronWidthsPtr->mDistr(idA, mA); }; | ||
| if (!integrateGauss(result, f, mMinA, min(mMaxA, eCM - m0B))) | ||
| success = false; | ||
| @@ -514,7 +514,7 @@ double NucleonExcitations::psSize(double eCM, ParticleDataEntry& prodA, | ||
| return 0.; | ||
|
|
||
| // Integrate mass of B. | ||
| - auto f = [=](double mB) { | ||
| + auto f = [=,this](double mB) { | ||
| return pCMS(eCM, m0A, mB) * hadronWidthsPtr->mDistr(idB, mB); }; | ||
| if (!integrateGauss(result, f, mMinB, min(mMaxB, eCM - m0A))) | ||
| success = false; | ||
| @@ -526,10 +526,10 @@ double NucleonExcitations::psSize(double eCM, ParticleDataEntry& prodA, | ||
| return 0.; | ||
|
|
||
| // Define integrand of outer integral. | ||
| - auto I = [=, &success](double mA) { | ||
| + auto I = [=, &success, this](double mA) { | ||
|
|
||
| // Define integrand of inner integral. | ||
| - auto f = [=](double mB) { | ||
| + auto f = [=,this](double mB) { | ||
| return pCMS(eCM, mA, mB) | ||
| * hadronWidthsPtr->mDistr(idA, mA) | ||
| * hadronWidthsPtr->mDistr(idB, mB); }; | ||
| diff --git a/src/PythiaParallel.cc b/src/PythiaParallel.cc | ||
| index 81450e2..7ec3a92 100644 | ||
| --- a/src/PythiaParallel.cc | ||
| +++ b/src/PythiaParallel.cc | ||
| @@ -106,7 +106,7 @@ bool PythiaParallel::init(function<bool(Pythia&)> customInit) { | ||
| bool initSuccess = true; | ||
|
|
||
| for (int iPythia = 0; iPythia < numThreads; iPythia += 1) { | ||
| - initThreads.emplace_back([=, &seeds, &initSuccess]() { | ||
| + initThreads.emplace_back([=, &seeds, &initSuccess, this]() { | ||
| Pythia* pythiaPtr = new Pythia(settings, particleData, false); | ||
| pythiaObjects[iPythia] = unique_ptr<Pythia>(pythiaPtr); | ||
| pythiaObjects[iPythia]->settings.flag("Print:quiet", true); | ||
| -- | ||
| 2.31.1 | ||
|
|
Oops, something went wrong.