athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-09-17T03:03:45+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/36446Update test_MC16a_Digi_tf_configuration.py (ATLASSIM-4787)2020-09-17T03:03:45+02:00John Derek ChapmanUpdate test_MC16a_Digi_tf_configuration.py (ATLASSIM-4787)Update list of expected `MdtDigitizationTool` properties in `test_MC16a_Digi_tf_configuration.py` after changes in !36332.
Fixes ATLASSIM-4787.Update list of expected `MdtDigitizationTool` properties in `test_MC16a_Digi_tf_configuration.py` after changes in !36332.
Fixes ATLASSIM-4787.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36439Sweeping !36179 from 21.0 to master.
Add sampling fraction code and analysis ...2020-09-17T03:03:31+02:00Atlas NightlybuildSweeping !36179 from 21.0 to master.
Add sampling fraction code and analysis for HECAdd sampling fraction code and analysis for HEC
See merge request atlas/athena!36179Add sampling fraction code and analysis for HEC
See merge request atlas/athena!36179https://gitlab.cern.ch/atlas/athena/-/merge_requests/36430Add FileName argument for JobOptsDumperCfg, use it for Digitization2020-09-23T03:03:04+02:00Rupert TombsAdd FileName argument for JobOptsDumperCfg, use it for DigitizationAllow the output file name from JobOptsDumperCfg to be configurable; it previously emitted "OverlayTestConfig.txt" only.
Add the job options dump to PileUp digitization config, and use this options to separate the two digitization new...Allow the output file name from JobOptsDumperCfg to be configurable; it previously emitted "OverlayTestConfig.txt" only.
Add the job options dump to PileUp digitization config, and use this options to separate the two digitization new config tests.
Add OverlayJobOptsDumperCfg for use in Overlay tests.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36412SubDetectorEnvelopes+SimHelpers+G4AtlasInterfaces: Enable thread-safety check...2020-09-16T03:03:50+02:00Scott SnyderSubDetectorEnvelopes+SimHelpers+G4AtlasInterfaces: Enable thread-safety checking.Enable thread-safety checking.
Add a couple missing const keywords.Enable thread-safety checking.
Add a couple missing const keywords.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36411GeoMaterial2G4+Geo2G4: Add missing const qualifiers.2020-09-16T03:02:35+02:00Scott SnyderGeoMaterial2G4+Geo2G4: Add missing const qualifiers.Treat return from GetMaterialPropertiesTable() as const.
Needed to go with upcoming thread-safety fixes in GeoModelUtilities.Treat return from GetMaterialPropertiesTable() as const.
Needed to go with upcoming thread-safety fixes in GeoModelUtilities.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36379InDetSimEvent: Thread-safety cleanup.2020-09-15T03:03:04+02:00Scott SnyderInDetSimEvent: Thread-safety cleanup.Mark the ContextSpecificPtr as thread-safe, rather than marking the
containing method as not thread-safe.Mark the ContextSpecificPtr as thread-safe, rather than marking the
containing method as not thread-safe.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36360(AnalysisBase) LCG_98python3 Update, master branch (2020.09.11.)2020-09-25T16:34:25+02:00Attila Krasznahorkay(AnalysisBase) LCG_98python3 Update, master branch (2020.09.11.)This is sort of a follow-up to !35630.
First of all, it switches all projects from [atlasexternals-2.0.75](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.75) to [atlasexternals-2.0.76](https://gitlab.cern.ch/atlas/atlasexterna...This is sort of a follow-up to !35630.
First of all, it switches all projects from [atlasexternals-2.0.75](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.75) to [atlasexternals-2.0.76](https://gitlab.cern.ch/atlas/atlasexternals/-/tags/2.0.76). The list of changes between the two is the following (https://gitlab.cern.ch/atlas/atlasexternals/-/compare/2.0.75...2.0.76):
- Updated all "standalone externals" to the versions provided by [LCG_98python3](http://lcginfo.cern.ch/release/98python3/). Most importantly I switched to ROOT 6.22/00 and Python 3.7.6 for the AnalysisBase build.
- Removed the [FFTW](http://www.fftw.org/) package from the repository, setting up AthenaExternals to rather pick it up [from LCG](http://lcginfo.cern.ch/pkg/fftw/);
- Updated how [Acts](https://github.com/acts-project/acts) would find [Boost](https://www.boost.org/), [Eigen](http://eigen.tuxfamily.org) and [nlohmann_json](https://github.com/nlohmann/json) in the LCG release;
- Updated how [GeoModelTools](https://gitlab.cern.ch/GeoModelDev/GeoModelTools) would pick up [nlohmann_json](https://github.com/nlohmann/json) from the LCG release.
I also had to update a number of packages in this repository to deal with these updates. Most of them were trivial issues arising from the external version updates for analysis packages, and from previous build configuration mistakes that were highlighted by the change in where [FFTW](http://www.fftw.org/), [nlohmann_json](https://github.com/nlohmann/json) and [GoogleTest](https://github.com/google/googletest) would be picked up for the Athena project.
As discussed on
- https://groups.cern.ch/group/hn-atlas-offlineSWHelp/Lists/Archive/Flat.aspx?RootFolder=%2Fgroup%2Fhn%2Datlas%2DofflineSWHelp%2FLists%2FArchive%2FFFTW%20usage%20in%20TrkVertexSeedFinderUtils&FolderCTID=0x012002002BD1887D3A9C0D489560C010AA1FE9F4
- https://groups.cern.ch/group/hn-atlas-offlineSWDevelopment/Lists/Archive/Flat.aspx?RootFolder=%2Fgroup%2Fhn%2Datlas%2DofflineSWDevelopment%2FLists%2FArchive%2FFFTW%20usage%20in%20TrkVertexSeedFinderUtils&FolderCTID=0x01200200FBC5CE5673348640AB112EE6AB5B8297
, I also made some more significant updates to [TrkSeedFinderUtils](https://gitlab.cern.ch/atlas/athena/-/tree/master/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils) to make it work with the [FFTW](http://www.fftw.org/) version provided by [LCG_98python3](http://lcginfo.cern.ch/release/98python3/).
I had to update [RootUtils](https://gitlab.cern.ch/atlas/athena/-/tree/master/Control/RootUtils), since for some unknown reason in a standalone build I had to link it explicitly against `libcppyy`. (I don't know why, since the `libROOTTPython.so` dependency should automatically pull in the `libcppyy3_7.so` dependency as well... :confused:) And while at it, I cleaned up the CMake configuration of that package a bit.
Finally, I did some housekeeping in the projects. Synchronising the version numbers of all of them, and making sure that AthDataQuality would really use [LCG_98python3](http://lcginfo.cern.ch/release/98python3/). @wlampl, unfortunately I missed this, that !35630 was doing this update incorrectly. (But since we don't build AthDataQuality in the master branch in either the CI or the nightly, this did not show up as an error.)https://gitlab.cern.ch/atlas/athena/-/merge_requests/36352Migrate PileUpMergeSvc and more RunDependent new config2020-09-17T14:54:17+02:00Rupert TombsMigrate PileUpMergeSvc and more RunDependent new configImplement new style configuration for PileUpMergeSvc; apply it to PileUp digitization config functions.
Migrate the rest of RunDependentConfig.
Add EvtIdModifierSvcCfg to the pileup digitization configuration test, to test it.Implement new style configuration for PileUpMergeSvc; apply it to PileUp digitization config functions.
Migrate the rest of RunDependentConfig.
Add EvtIdModifierSvcCfg to the pileup digitization configuration test, to test it.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36348Fixing ATLASSIM-47572020-09-16T03:03:22+02:00John Derek ChapmanFixing ATLASSIM-4757Fix bug in SimulationSelector configuration for Quasi-stable particle simulation jobs
introduced in !36231. Fixes ATLASSIM-4757.Fix bug in SimulationSelector configuration for Quasi-stable particle simulation jobs
introduced in !36231. Fixes ATLASSIM-4757.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36347Manual sweep 359862020-10-07T03:03:36+02:00Michael Duehrssen-DeblingManual sweep 35986Manual sweep of !35986 into masterManual sweep of !35986 into masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36346Manual sweep of !36345: Address path resolver issue in ATLASSIM-4674 and stor...2020-09-16T03:02:18+02:00John Derek ChapmanManual sweep of !36345: Address path resolver issue in ATLASSIM-4674 and store ParamFile in HITS file metadataPath resolver issues an error if the absolute path to a file is specified. Tweaked the preExec in `test_MC16_G4FastCalo_ttbar.sh` to allow the relative path to be used. This should fix ATLASIM-4674.
This merge request also adds the rela...Path resolver issues an error if the absolute path to a file is specified. Tweaked the preExec in `test_MC16_G4FastCalo_ttbar.sh` to allow the relative path to be used. This should fix ATLASIM-4674.
This merge request also adds the relative path to the FCS V2 param file to the HITS file metadata to make book-keeping easier.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36345Address path resolver issue in ATLASSIM-4674 and store ParamFile in HITS file...2020-10-16T12:19:40+02:00John Derek ChapmanAddress path resolver issue in ATLASSIM-4674 and store ParamFile in HITS file metadataPath resolver issues an error if the absolute path to a file is specified. Tweaked the preExec in `test_MC16_G4FastCalo_ttbar.sh` to allow the relative path to be used. This should fix ATLASIM-4674.
This merge request also adds the rela...Path resolver issues an error if the absolute path to a file is specified. Tweaked the preExec in `test_MC16_G4FastCalo_ttbar.sh` to allow the relative path to be used. This should fix ATLASIM-4674.
This merge request also adds the relative path to the FCS V2 param file to the HITS file metadata to make book-keeping easier.
(Will make a separate MR for ~master, so adding ~"sweep:ignore".)https://gitlab.cern.ch/atlas/athena/-/merge_requests/36328Digitization: Add missing flag.2020-09-15T03:03:29+02:00Scott SnyderDigitization: Add missing flag.Add missing flag Digitization.PileUpBunchSpacing.
Fixes failure in AthenaConfiguration.Add missing flag Digitization.PileUpBunchSpacing.
Fixes failure in AthenaConfiguration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36282HitManagement: Fix cppcheck warnings.2020-09-17T03:02:54+02:00Scott SnyderHitManagement: Fix cppcheck warnings.Shifting signed value by 31 bits.
Pass class instances by const reference, not by value.Shifting signed value by 31 bits.
Pass class instances by const reference, not by value.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36261Do not write EventTag in new-style simulation jobs2020-09-10T03:04:08+02:00Tadej Novaktadej.novak@cern.chDo not write EventTag in new-style simulation jobsAnother leftover of incorrect event tag writing. This time fixing new-style simulation config.
@rtombs, @jchapman, according to LXR these are the only places. Please correct me if I'm wrong (or if you have more changes in the pipeline)....Another leftover of incorrect event tag writing. This time fixing new-style simulation config.
@rtombs, @jchapman, according to LXR these are the only places. Please correct me if I'm wrong (or if you have more changes in the pipeline).
Also tagging @nstyles.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36256Migrate various unit tests to IOptionsSvc2020-09-10T03:04:43+02:00Frank WinklmeierMigrate various unit tests to IOptionsSvcMigrate various unit tests from the deprecated `IJobOptionsSvc` interface to `IOptionsSvc`. Where not used, just remove the code referencing `IJobOptionsSvc` entirely.Migrate various unit tests from the deprecated `IJobOptionsSvc` interface to `IOptionsSvc`. Where not used, just remove the code referencing `IJobOptionsSvc` entirely.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36245Preparation of Athena to HepMC32020-09-10T03:02:18+02:00Andrii VerbytskyiPreparation of Athena to HepMC3Preparation of Athena to HepMC3
Mostly small replacements of GenParticle* with GenparticlePtr and similar.Preparation of Athena to HepMC3
Mostly small replacements of GenParticle* with GenparticlePtr and similar.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36231Minor tidying of MT ISF configuration2020-09-11T14:24:20+02:00John Derek ChapmanMinor tidying of MT ISF configuration`SimKernelMT` should not be verbose by default.
Modify `ISimulationSelector` instances not to retrieve Simulation Services in the thread-safe implementation.`SimKernelMT` should not be verbose by default.
Modify `ISimulationSelector` instances not to retrieve Simulation Services in the thread-safe implementation.https://gitlab.cern.ch/atlas/athena/-/merge_requests/36228Cleanup and improve Overlay and OverlayMT tests2020-09-08T03:02:29+02:00Tadej Novaktadej.novak@cern.chCleanup and improve Overlay and OverlayMT tests- add data overlay ST vs MT test
- filter out `HepMcParticleLink` logs so other failures are easier to debug
- fix shell warnings
- fix incorrect comments- add data overlay ST vs MT test
- filter out `HepMcParticleLink` logs so other failures are easier to debug
- fix shell warnings
- fix incorrect commentshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/36227Do not write event tag in some additional simulation job transforms2020-09-08T03:03:52+02:00Tadej Novaktadej.novak@cern.chDo not write event tag in some additional simulation job transformsFixes ATLASSIM-4744.Fixes ATLASSIM-4744.