athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-07-18T13:01:23+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/34888FIx AGENE-18182020-07-18T13:01:23+02:00Giancarlo PanizzoFIx AGENE-1818External/Pythia8 and Generators/Pythia8_i were working with the Pythia 8.3 series with two exceptions, which this MR is fixing:
1) soft qcd processes: Pythia8.3 needs, on top of the share/Pythia8/xmldoc subfolder, also share/Pythia8/p...External/Pythia8 and Generators/Pythia8_i were working with the Pythia 8.3 series with two exceptions, which this MR is fixing:
1) soft qcd processes: Pythia8.3 needs, on top of the share/Pythia8/xmldoc subfolder, also share/Pythia8/pdfdata, which is now properly copied into the installArea by External/Pythia8/CMakeLists.txt
2) UserHooks: Pythia8.3 changed the internal user hooks pointer from UserHooks* to shared_ptr<UserHooks*>. This must be managed with some care when trying to support both Pythia8.2 and Pythia8.3, which is now done by our interface Pythia8_i
Simple technical tests are passed. Now needs physics validation, out of the scope of this MR.
See https://its.cern.ch/jira/browse/AGENE-1818
Ghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/34890Fix AGENE-18182020-07-22T03:06:42+02:00Giancarlo PanizzoFix AGENE-1818External/Pythia8 and Generators/Pythia8_i were working with the Pythia 8.3 series with two exceptions, which this MR is fixing:
1. soft qcd processes: Pythia8.3 needs, on top of the share/Pythia8/xmldoc subfolder, also share/Pythia8/pdf...External/Pythia8 and Generators/Pythia8_i were working with the Pythia 8.3 series with two exceptions, which this MR is fixing:
1. soft qcd processes: Pythia8.3 needs, on top of the share/Pythia8/xmldoc subfolder, also share/Pythia8/pdfdata, which is now properly copied into the installArea by External/Pythia8/CMakeLists.txt
1. UserHooks: Pythia8.3 changed the internal user hooks pointer from UserHooks\* to shared_ptr<UserHooks\*>. This must be managed with some care when trying to support both Pythia8.2 and Pythia8.3, which is now done by our interface Pythia8_i
Simple technical tests are passed. Now needs physics validation, out of the scope of this MR.
See https://its.cern.ch/jira/browse/AGENE-1818 Ghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/39547add packages needed for Pythia8.3, introduce corrections for jet filters, add...2021-01-09T03:02:39+01:00Ewelina Maria Lobodzinskaadd packages needed for Pythia8.3, introduce corrections for jet filters, add MultiBjetFilterIn order to fix the ART tests, some changes already available in 21.6, need to be added to master.
In this MR some packages needed for Pythia8.3xx are installed in External/Pythia8/CMakeLists.txt and
MultiBjetFilter is added to Generato...In order to fix the ART tests, some changes already available in 21.6, need to be added to master.
In this MR some packages needed for Pythia8.3xx are installed in External/Pythia8/CMakeLists.txt and
MultiBjetFilter is added to GeneratorFilters.
Additionally, GenerateTruthJets.py file is corrected to take into account the changes introduced in JetRec package in master (and not present in 21.6)https://gitlab.cern.ch/atlas/athena/-/merge_requests/40039SITEROOT Setting Fixes, master branch (2021.01.27.)2021-01-29T03:03:41+01:00Attila KrasznahorkaySITEROOT Setting Fixes, master branch (2021.01.27.)Made it possible to use `SITEROOT` != `"/afs/cern.ch"` during the build. The CMake code was unfortunately not acknowledging the setting of that variable in the build environment before now. :frowning:
These are necessary to have the `ma...Made it possible to use `SITEROOT` != `"/afs/cern.ch"` during the build. The CMake code was unfortunately not acknowledging the setting of that variable in the build environment before now. :frowning:
These are necessary to have the `master--dev3LCG` and `master--dev4LCG` nightlies "remember" where they should pick up data files from at runtime, without the user having to specify it himself/herself, as discussed at length in:
https://groups.cern.ch/group/atlas-comp-ASCIG/Lists/Archive/Flat.aspx?RootFolder=%2Fgroup%2Fatlas%2Dcomp%2DASCIG%2FLists%2FArchive%2Fa%20sym%2Dlink%20cvmfssft%2Ecern%2Echswlcg%20%28%2D%20%2Elcg%29%20is%20needed%20to%20replace%20afscern%2Echsw&FolderCTID=0x012002003B8F97C71259CF40BFBDAF9DB1662075
This should also allow us to fix ATLINFR-3946. (After some further tweaks in the Jenkins jobs.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/41776AtlasPyFwdBwdPorts: fix pytest related build problems (ATLINFR-4022)2021-03-20T03:06:06+01:00Frank WinklmeierAtlasPyFwdBwdPorts: fix pytest related build problems (ATLINFR-4022)Remove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream,...Remove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream, see e.g. https://github.com/PyCQA/mccabe/pull/75.
Manual sweep of !41744.https://gitlab.cern.ch/atlas/athena/-/merge_requests/41764Sweeping !41744 from 21.3 to 21.6.
AtlasPyFwdBwdPorts: fix pytest related bui...2021-03-20T03:06:36+01:00Atlas NightlybuildSweeping !41744 from 21.3 to 21.6.
AtlasPyFwdBwdPorts: fix pytest related build problemsAtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744AtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744https://gitlab.cern.ch/atlas/athena/-/merge_requests/41765Sweeping !41744 from 21.3 to 21.9.
AtlasPyFwdBwdPorts: fix pytest related bui...2021-03-20T03:06:43+01:00Atlas NightlybuildSweeping !41744 from 21.3 to 21.9.
AtlasPyFwdBwdPorts: fix pytest related build problemsAtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744AtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744https://gitlab.cern.ch/atlas/athena/-/merge_requests/41766Sweeping !41744 from 21.3 to 21.0.
AtlasPyFwdBwdPorts: fix pytest related bui...2021-04-03T03:05:04+02:00Atlas NightlybuildSweeping !41744 from 21.3 to 21.0.
AtlasPyFwdBwdPorts: fix pytest related build problemsAtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744AtlasPyFwdBwdPorts: fix pytest related build problems
See merge request atlas/athena!41744https://gitlab.cern.ch/atlas/athena/-/merge_requests/41744AtlasPyFwdBwdPorts: fix pytest related build problems2021-05-07T15:57:57+02:00Frank WinklmeierAtlasPyFwdBwdPorts: fix pytest related build problemsRemove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream,...Remove the `pytest` requirement from `mccabe` and `flake8` which all of
a sudden started to create problems. Since we only build these packages
and never run their tests this dependency is not really needed. It was
also removed upstream, see e.g. https://github.com/PyCQA/mccabe/pull/75.
Fixes ATLINFR-4022.https://gitlab.cern.ch/atlas/athena/-/merge_requests/43312AtlasPyFwdBwdPorts: fix pytest related build problems (ATLINFR-4022), 21.0-ma...2021-05-11T10:53:16+02:00Attila KrasznahorkayAtlasPyFwdBwdPorts: fix pytest related build problems (ATLINFR-4022), 21.0-mac16d branch (2021.05.07.)Remove the `pytest` requirement from `mccabe` and `flake8` which all of a sudden started to create problems. Since we only build these packages and never run their tests this dependency is not really needed. It was also removed upstream,...Remove the `pytest` requirement from `mccabe` and `flake8` which all of a sudden started to create problems. Since we only build these packages and never run their tests this dependency is not really needed. It was also removed upstream, see e.g. https://github.com/PyCQA/mccabe/pull/75.
Note that this is a manual cherry-pick from !41744, for the benefit of ATLINFR-4024.https://gitlab.cern.ch/atlas/athena/-/merge_requests/54921Add uuidgen to AthGeneration, 21.6 (2022.07.07.)2022-07-11T21:43:45+02:00Attila KrasznahorkayAdd uuidgen to AthGeneration, 21.6 (2022.07.07.)Added the build of the `uuidgen` executable to the [AthGeneration](Projects/AthGeneration) project, as a solution proposal for ATLINFR-4616.
Since this is a problem very specifically for ~21.6, I didn't want to add code for it into [atl...Added the build of the `uuidgen` executable to the [AthGeneration](Projects/AthGeneration) project, as a solution proposal for ATLINFR-4616.
Since this is a problem very specifically for ~21.6, I didn't want to add code for it into [atlas/atlasexternals](https://gitlab.cern.ch/atlas/atlasexternals). It seemed good enough to just add the code to specifically this branch.
I downloaded all the sources from https://github.com/util-linux/util-linux, as that seemed to be the most up-to-date version of this executable. But:
- This is GPLv2 code. Requiring us to put their license into our repository. Which I'm not chuffed about.
- I had to tweak the code a little to work with the older version of [libuuid](https://lcginfo.cern.ch/pkg/uuid/) coming from [LCG_88b](https://lcginfo.cern.ch/release/88b/).
* But this still seemed a little easier than to figure out exactly which version of the code to take for the specific version of `libuuid` that we have.
- Wow was the build setup of this code in CMake not completely trivial.
* Still, I definitely didn't want to build everything from [util-linux](https://github.com/util-linux/util-linux) with its own build system just to get the `uuidgen` executable.
I'd leave it to @elmsheus and @nstyles to decide if including GPLv2 code in the repository may be acceptable. :thinking:Attila KrasznahorkayAttila Krasznahorkayhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66757PYTHIA8: define PYTHIA8DATA environment variable2023-10-26T21:43:25+02:00Ewelina Maria LobodzinskaPYTHIA8: define PYTHIA8DATA environment variabledefine PYTHIA8DATA environment variable needed by Herwig7_TheP8I.py file which handles Lund hadronisation setting.define PYTHIA8DATA environment variable needed by Herwig7_TheP8I.py file which handles Lund hadronisation setting.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68256Draft: Adding an example JO showing how to use the new Pythia8 UserHook2024-02-01T08:18:09+01:00Safa Gaidsafa.gaid@cern.chDraft: Adding an example JO showing how to use the new Pythia8 UserHookI added an example JO that shows how to use the new Pythia8 UserHook mergingDJRs.I added an example JO that shows how to use the new Pythia8 UserHook mergingDJRs.