athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2018-12-19T11:16:14+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/20004Update version.txt2018-12-19T11:16:14+01:00Ewelina Maria LobodzinskaUpdate version.txtupdate to version 21.6.2update to version 21.6.2https://gitlab.cern.ch/atlas/athena/-/merge_requests/20008migrate PileUpEventInfo to xAOD::EvenInfo2019-02-13T03:02:35+01:00Marcin Nowakmigrate PileUpEventInfo to xAOD::EvenInfoMigrated PileUpEventInfo to xAOD::EvenInfo
Jira: https://its.cern.ch/jira/browse/ATLASSIM-2633Migrated PileUpEventInfo to xAOD::EvenInfo
Jira: https://its.cern.ch/jira/browse/ATLASSIM-2633https://gitlab.cern.ch/atlas/athena/-/merge_requests/20149Adapt to acts 0.7.32019-01-28T15:25:38+01:00Paul Gessinger-BefurtAdapt to acts 0.7.3Adds changes necessary to build against Acts v0.7.3, which has been bumped and merge into atlasexternals master. The change has not been tagged yet, however.Adds changes necessary to build against Acts v0.7.3, which has been bumped and merge into atlasexternals master. The change has not been tagged yet, however.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20252Externals Update, master branch (2019.01.09.)2019-01-14T20:02:48+01:00Attila KrasznahorkayExternals Update, master branch (2019.01.09.)While I know that ATLASRECTS-4815 is still in flight to be fixed, I wanted to open this already now. As it may anyway take a while to go through.
With this update I switched all projects to [atlasexternals-2.0.18](https://gitlab.cern.ch...While I know that ATLASRECTS-4815 is still in flight to be fixed, I wanted to open this already now. As it may anyway take a while to go through.
With this update I switched all projects to [atlasexternals-2.0.18](https://gitlab.cern.ch/atlas/atlasexternals/tags/2.0.18). The full list of changes is: https://gitlab.cern.ch/atlas/atlasexternals/compare/2.0.17...2.0.18
Namely:
- Updated AnalysisBaseExternals to build TBB, and make the standalone version of ROOT build against that version of TBB;
- Made it possible to build AnalysisBaseExternals on PPC64 and in C++17 mode;
- Updated Acts to version 0.7.3 (cc. @pagessin);
- Updates to CheckerGccPlugins for GCC 9 (cc. @ssnyder);
- Updated all projects to use LCG_94a (cc. @emoyse, @wlampl).
Since LCG_94a brings in ROOT 6.14/08 which has a number of improvements over the currently used 6.14/04 version, I decided to update all projects to this LCG version.
But my main motivation for this update is to pave the way for another MR that will revive a stripped-down version of AnalysisBase in the master branch. As I want to be able to start developing some standalone code in the master branch. (Including building code on PPC64...)https://gitlab.cern.ch/atlas/athena/-/merge_requests/20264Update externals.txt2019-01-14T16:13:11+01:00Ewelina Maria LobodzinskaUpdate externals.txtupdate atlasexternals tagupdate atlasexternals taghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20265Update externals.txt2019-01-10T11:53:10+01:00Ewelina Maria LobodzinskaUpdate externals.txtupdate externals to tag 1.0.44update externals to tag 1.0.44https://gitlab.cern.ch/atlas/athena/-/merge_requests/20276Update externals.txt2019-01-15T09:49:28+01:00Ewelina Maria LobodzinskaUpdate externals.txtupdate atlasexternals tag to 1.0.44update atlasexternals tag to 1.0.44https://gitlab.cern.ch/atlas/athena/-/merge_requests/20277Update externals.txt2019-01-15T09:48:57+01:00Ewelina Maria LobodzinskaUpdate externals.txtupdate atlasexternals tag to 1.0.44update atlasexternals tag to 1.0.44https://gitlab.cern.ch/atlas/athena/-/merge_requests/20278Update externals.txt2019-02-25T13:41:24+01:00Ewelina Maria LobodzinskaUpdate externals.txtupdate atlasexternals tag to 1.0.44update atlasexternals tag to 1.0.44https://gitlab.cern.ch/atlas/athena/-/merge_requests/20305Externals Update, 21.2 branch (2019.01.11.)2019-02-13T18:16:47+01:00Attila KrasznahorkayExternals Update, 21.2 branch (2019.01.11.)Updated all projects to [atlasexternals-1.0.45](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.45). This is to switch the analysis releases to LCG_94a. (And to bring in all the recent developments of that repository.)
The full l...Updated all projects to [atlasexternals-1.0.45](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.45). This is to switch the analysis releases to LCG_94a. (And to bring in all the recent developments of that repository.)
The full list of changes since [atlasexternals-1.0.38](https://gitlab.cern.ch/atlas/atlasexternals/tags/1.0.38) is **massive** (https://gitlab.cern.ch/atlas/atlasexternals/compare/1.0.38...1.0.45). The important ones for us are:
- Updated from `LCG_93` to `LCG_94a`, including updating all the standalone externals to the versions used in `LCG_94a`;
- Updated to KLFitter 1.2.1 (@kzoch);
- Updated to HDF5 1.10.3 (@dguest);
- Updated to lwtnn 2.8;
- Improved the dictionary building dependency generation to make the incremental CI builds a bit more robust;
You can find some more information about the previous attempt to upgrade to `LCG_94` on:
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15918
- https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/14785
Unfortunately I was not able to do absolutely every test I wanted with AthAnalysis, so it's not impossible that the build of that would still have some issues. :frowning:https://gitlab.cern.ch/atlas/athena/-/merge_requests/20344Disable TrigEFLongLivedParticles build in Athena package_filters.txt2019-01-16T03:02:49+01:00Rafal Bielskirafal.bielski@cern.chDisable TrigEFLongLivedParticles build in Athena package_filters.txtDisabling an obsolete package TrigEFLongLivedParticles from the build. If no problems are observed in any nightly tests, the package will be removed from the repository later. Relevant JIRA ticket: ATR-19150.
cc @hrussell, @jakoubekDisabling an obsolete package TrigEFLongLivedParticles from the build. If no problems are observed in any nightly tests, the package will be removed from the repository later. Relevant JIRA ticket: ATR-19150.
cc @hrussell, @jakoubekhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/2034721.6 jetrec2019-01-14T16:56:29+01:00Ewelina Maria Lobodzinska21.6 jetrecAdd some changes introduced in order to prepare for JetRec running on truth levelAdd some changes introduced in order to prepare for JetRec running on truth levelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20368DAOD_NANO prototype using CP algorithms2019-01-24T03:03:14+01:00Kerim SurulizDAOD_NANO prototype using CP algorithmsA first version of a small derivation format containing calibrated objects.
Tagging @elmsheus @jcatmore @akraszna @krumnack @egramsta . A few notes:
- I needed to include the CP algorithms in AthDerivation; previously they were only in...A first version of a small derivation format containing calibrated objects.
Tagging @elmsheus @jcatmore @akraszna @krumnack @egramsta . A few notes:
- I needed to include the CP algorithms in AthDerivation; previously they were only in the analysis releases.
- I also needed to (trivally) modify a couple of thinning tools to make sure they actually do the thinning even if the object container supplied was empty. ****Derivation experts, please look at this carefully**** to make sure it doesn't break anything (my tests seemed to be OK, but...).
- I added a `deepCopyOutput` option to the various algorithm sequences - this is needed to dump the calibrated object containers out to the DAOD.
- The change in `Event/EventBookkeeperTools/src/EventCounterAlg.cxx` is required by the fact that the CP algorithms require the `PileupAnalysisSequence` to be run to work. This in turns creates a new `EventInfo` object, so a simple `evtStore()->retrieve(evtInfo);` no longer works without spelling out the name of the container.
- I copied the config files used by the `TauAnalysisSequence` from `SUSYTools` to the `TauAnalysisAlgorithms` package itself. Something like this will eventually need to be done anyway, and it seems a better solution than including `SUSYTools` in `AthDerivation` for this purpose only.
- One shouldn't pay too much attention to the physics content of the format at this stage. The idea was to get something that runs and can be built on.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20377Externals Update, master branch (2019.01.15.)2019-01-17T09:43:40+01:00Attila KrasznahorkayExternals Update, master branch (2019.01.15.)This is mainly to fix ATLINFR-2871.
The update to [atlasexternals-2.0.20](https://gitlab.cern.ch/atlas/atlasexternals/tags/2.0.20) brings the following updates (https://gitlab.cern.ch/atlas/atlasexternals/compare/2.0.19...2.0.20):
- I...This is mainly to fix ATLINFR-2871.
The update to [atlasexternals-2.0.20](https://gitlab.cern.ch/atlas/atlasexternals/tags/2.0.20) brings the following updates (https://gitlab.cern.ch/atlas/atlasexternals/compare/2.0.19...2.0.20):
- Introduced the `LCG_IGNORED_SYSTEM_PATHS` and `LCG_SYSTEM_IGNORE_PATH` variables for influencing globally what directories to ignore during the build and environment setup script generation;
- Fixed the RPM dependency problem introduced when `FindTBB.cmake` started setting up `TBB_VERSION` using `tbb/tbb_stddef.h`.
At the same time I took the opportunity to clean up the build scripts in the master branch a bit. I turned all `-x` arguments into ones that can be specified multiple times, and they would remember/use all the received arguments. This required a bit of BASH magic that I just "stole" off of StackOverflow...
I removed the `-d` options from the scripts that had it, as in the new implementation users wanting to debug our cmake configurations will be able to provide `-x --trace` to the build scripts instead.
Finally, I also removed the git version checks from the build scripts. That version check was added when we were still thinking of attaching "notes" to git tags that would be created by the build scripts. But since we never started doing that, the scripts can really operate with any version of git.
Cc-ing the main developers/users of these scripts: @ozenin, @smh, @fwinkl, @leggett.https://gitlab.cern.ch/atlas/athena/-/merge_requests/20404AnalysisBase Revival, master branch (2019.01.17.)2019-02-01T12:33:47+01:00Attila KrasznahorkayAnalysisBase Revival, master branch (2019.01.17.)With this MR I would like to revive a dumbed down version of AnalysisBase in the master branch. The project only builds the xAOD EDM and the standalone I/O code built around it. Its purpose is mainly to allow further developments.
Quite...With this MR I would like to revive a dumbed down version of AnalysisBase in the master branch. The project only builds the xAOD EDM and the standalone I/O code built around it. Its purpose is mainly to allow further developments.
Quite a few files had to be touched, but after updating the files under `Project/AnalysisBase` the other updates were all just to make it possible to build all core packages needed by AnalysisBase in "standalone mode" once again. This did reveal a number of unfortunate updates in the xAOD packages, which I tried to fix here...
Cc-ing @ksuruliz and @krumnack, they'll probably want to know about this development. Nils, I started updating `ROOTCORE` definitions to `XAOD_STANDALONE` in the code, that should be continued later on. I just didn't want to bloat this MR any further with that...
For the shifters: In many files the update goes from `2017` to `2018`, because I actually made the commits for those updates still last year. :stuck\_out\_tongue:https://gitlab.cern.ch/atlas/athena/-/merge_requests/20410formatting 'time' output in a safe way (ATLINFR-2731)2019-01-17T20:46:47+01:00Oleg Zeninformatting 'time' output in a safe way (ATLINFR-2731)Closes ATLINFR-2731Closes ATLINFR-2731https://gitlab.cern.ch/atlas/athena/-/merge_requests/20414update Gaudi to v31r0.0012019-01-19T03:02:25+01:00Charles Leggettupdate Gaudi to v31r0.001update Gaudi to master. improvements are:
* gaudi/Gaudi!826 MsgStream support in counters
* gaudi/Gaudi!825 improved ROOT dictionary dependency computation
* gaudi/Gaudi!824 MessageSvc option to printout full eventID
* gaudi/Gaud...update Gaudi to master. improvements are:
* gaudi/Gaudi!826 MsgStream support in counters
* gaudi/Gaudi!825 improved ROOT dictionary dependency computation
* gaudi/Gaudi!824 MessageSvc option to printout full eventID
* gaudi/Gaudi!775 simplify IAlgExecStateSvc interface
* gaudi/Gaudi!766 simplify Algorithm constructor
* gaudi/Gaudi!819 scheduler improvements
* gaudi/Gaudi!815 ChronoStatSvc MT safety
* gaudi/Gaudi!823 IoComponentMgr: interface to retrieve all filenames of componenthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20441WorkDir: Add doxygen configuration2019-01-22T03:02:32+01:00Frank WinklmeierWorkDir: Add doxygen configurationAdd a doxygen configuration file such that building the `doc` target
will create the doxygen pages of all locally selected packages as
explained in atlas/atlasexternals!345 and ATLINFR-1843.
cc @akrasznaAdd a doxygen configuration file such that building the `doc` target
will create the doxygen pages of all locally selected packages as
explained in atlas/atlasexternals!345 and ATLINFR-1843.
cc @akrasznahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/20445Database/APR/ImplicitCollection was added to the list of used packages2019-01-21T11:59:09+01:00Ewelina Maria LobodzinskaDatabase/APR/ImplicitCollection was added to the list of used packagesto ensure Rivet correct work ImplicitCollection was added to packagefilters.txt file to ensure Rivet correct work ImplicitCollection was added to packagefilters.txt file https://gitlab.cern.ch/atlas/athena/-/merge_requests/20525Externals Update, master branch (2019.01.22.)2019-01-25T11:37:54+01:00Attila KrasznahorkayExternals Update, master branch (2019.01.22.)This is to update to [atlasexternals-2.0.21](https://gitlab.cern.ch/atlas/atlasexternals/tags/2.0.21).
The full list of changes wrt. 2.0.20 is technically a lot (https://gitlab.cern.ch/atlas/atlasexternals/compare/2.0.20...2.0.21), thou...This is to update to [atlasexternals-2.0.21](https://gitlab.cern.ch/atlas/atlasexternals/tags/2.0.21).
The full list of changes wrt. 2.0.20 is technically a lot (https://gitlab.cern.ch/atlas/atlasexternals/compare/2.0.20...2.0.21), though conceptually it's a relatively short list.
- Introduced fixes for AnalysisBaseExternals on Ubuntu and macOS. This was cherry picked from 1.0, where I'm trying to revive the analysis release builds for these platforms.
- Added `FindCURL.cmake` to AtlasLCG to be able to use CURL from the LCG releases if necessary. This I made for ATLINFR-2820 originally, but in the end !20440 did make this update unnecessary. Still, it's not a bad update per se.
- Updated the code handling Doxygen to work successfully with LCG_94. This is to address ATLINFR-2883.
- Added a lot of CMake changes to make the code work smoothly with CMake >=3.13. (https://gitlab.cern.ch/atlas/atlasexternals/merge_requests/418)
It's the last point which is truly non-trivial. I made a **lot** of changes in the central code to resolve some long standing issues. This required changing a variable naming convention (telling `FindFoo.cmake` where to look for `Foo` using `FOO_ROOT`) that I used in that code since the very beginning. This also means that to incorporate this update in the externals, I also had to update a number of files in this repository. These changes are in all cases very trivial. Though quite numerous... :stuck\_out\_tongue:
I've been testing these changes for about a week now, still, since they are significant, it's not impossible that I may have missed something. Let's see what the CI tells us...