athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-10-13T21:42:19+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/47146AppMgr: memoize result of release_metadata2021-10-13T21:42:19+02:00Frank WinklmeierAppMgr: memoize result of release_metadataCache/memoize the result of `release_metadata` and switch from the
deprecated `SafeConfigParser` to `ConfigParser` (the latter is actually
the former in Python >= 3.2).Cache/memoize the result of `release_metadata` and switch from the
deprecated `SafeConfigParser` to `ConfigParser` (the latter is actually
the former in Python >= 3.2).https://gitlab.cern.ch/atlas/athena/-/merge_requests/47145TriggerConfig: drop legacy menu services2021-10-14T09:43:27+02:00Frank WinklmeierTriggerConfig: drop legacy menu servicesThis MR is the first step in cleaning up the legacy trigger services configuration. For default workflows we are only supporting the JSON-converted menu, which means we can use almost the same setup for Run-1&2 and Run-3 data. Further cl...This MR is the first step in cleaning up the legacy trigger services configuration. For default workflows we are only supporting the JSON-converted menu, which means we can use almost the same setup for Run-1&2 and Run-3 data. Further cleanup (and full CA-migration) will follow in separate MRs.
#### Changes to `TriggerConfigGetter`:
Move the creation and configuration of the JSON conversion for old data
into `TrigConfigSvcCfg`. Remove the setup of the legacy configuration
services and streamline the configuration of the Run-1&2 and Run-3
setup.
Fixes the duplicate menus in StoreGate reported in ATR-24199.
#### Changes to `TriggerConfigFlags`:
- Delete the following obsolete flags:
- `Trigger.doConfigVersionConversion`
- `Trigger.menuVersion`
- `Trigger.LVL1ConfigFile`
- `Trigger.L1MenuFile`
- `Trigger.HLTMenuFile`
- `Trigger.generateHLTMenu`
- put unit tests conditionally under `__main__`
Also align the default JSON output files names of `TrigConfReadWrite` with what we currently use in
the menu generation from python.
cc @tamartin @rbielski @markhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47144adding missing L1 in BKee L1Primary + adding BKee chains with L1_BKeePrescaled2021-10-13T21:44:08+02:00Gianantonio Pezzullog.pezzullo@yale.eduadding missing L1 in BKee L1Primary + adding BKee chains with L1_BKeePrescaledhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47143LwtnnUtils - Include EventPrimitives before any Eigen include2021-10-13T21:43:05+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chLwtnnUtils - Include EventPrimitives before any Eigen includeIntermediate fix to ATLINFR-4280Intermediate fix to ATLINFR-4280https://gitlab.cern.ch/atlas/athena/-/merge_requests/47141TrkAlgebraUtils - Include EventPrimitives before Eigen2021-10-13T21:43:33+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chTrkAlgebraUtils - Include EventPrimitives before EigenHi,
I've noticed that Eigen modules are included before the extensions can be loaded. This can lead to some head-against-screen-banging problems as the order of include files in downstream. In particular, I try to track down the issue
`...Hi,
I've noticed that Eigen modules are included before the extensions can be loaded. This can lead to some head-against-screen-banging problems as the order of include files in downstream. In particular, I try to track down the issue
```
In file included from /home/user/FixDigi_PhaseII/athena/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStation.h:13,
from /home/user/FixDigi_PhaseII/athena/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonStation.cxx:10:
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h: In function 'double Amg::angle(const Vector3D&, const Vector3D&)':
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:42:11: error: 'const Vector3D' {aka 'const class Eigen::Matrix<double, 3, 1>'} has no member named 'mag'; did you mean 'imag'?
dp /= v1.mag() * v2.mag();
^~~
imag
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:42:22: error: 'const Vector3D' {aka 'const class Eigen::Matrix<double, 3, 1>'} has no member named 'mag'; did you mean 'imag'?
dp /= v1.mag() * v2.mag();
^~~
imag
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h: In function 'void Amg::setPhi(Amg::Vector3D&, double)':
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:67:16: error: 'Amg::Vector3D' {aka 'class Eigen::Matrix<double, 3, 1>'} has no member named 'perp'; did you mean 'exp'?
double xy = v.perp();
```
in !46928
Intermediate fix to ATLINFR-4280https://gitlab.cern.ch/atlas/athena/-/merge_requests/47140GeoModel - Add GeoPrimtives dependency2021-10-13T15:43:21+02:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chGeoModel - Add GeoPrimtives dependencyHi,
I've noticed that Eigen modules are included before the extensions can be loaded. This can lead to some head-against-screen-banging problems as the order of include files in downstream. In particular, I try to track down the issue
`...Hi,
I've noticed that Eigen modules are included before the extensions can be loaded. This can lead to some head-against-screen-banging problems as the order of include files in downstream. In particular, I try to track down the issue
```
In file included from /home/user/FixDigi_PhaseII/athena/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonStation.h:13,
from /home/user/FixDigi_PhaseII/athena/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MuonStation.cxx:10:
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h: In function 'double Amg::angle(const Vector3D&, const Vector3D&)':
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:42:11: error: 'const Vector3D' {aka 'const class Eigen::Matrix<double, 3, 1>'} has no member named 'mag'; did you mean 'imag'?
dp /= v1.mag() * v2.mag();
^~~
imag
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:42:22: error: 'const Vector3D' {aka 'const class Eigen::Matrix<double, 3, 1>'} has no member named 'mag'; did you mean 'imag'?
dp /= v1.mag() * v2.mag();
^~~
imag
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h: In function 'void Amg::setPhi(Amg::Vector3D&, double)':
/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2021-10-10T2101/Athena/22.0.46/InstallArea/x86_64-centos7-gcc8-opt/src/DetectorDescription/GeoPrimitives/GeoPrimitives/GeoPrimitivesHelpers.h:67:16: error: 'Amg::Vector3D' {aka 'class Eigen::Matrix<double, 3, 1>'} has no member named 'perp'; did you mean 'exp'?
double xy = v.perp();
```
in !46928
Intermediate fix to ATLINFR-4280https://gitlab.cern.ch/atlas/athena/-/merge_requests/47139PerfMonComps: Add a minimal job to the CA configuration that demonstrates wha...2021-10-13T15:45:45+02:00Alaettin Serhan MetePerfMonComps: Add a minimal job to the CA configuration that demonstrates what PerfMonMT can doThis MR makes the `PerfMonCompsConfig.py` runnable for demonstration purposes. It'll process 100 events in which we execute one algorithm (`CpuCruncherAlg`) that uses 100 +/- 1 ms/event of CPU time and another algorithm (`LeakyAlg`) that...This MR makes the `PerfMonCompsConfig.py` runnable for demonstration purposes. It'll process 100 events in which we execute one algorithm (`CpuCruncherAlg`) that uses 100 +/- 1 ms/event of CPU time and another algorithm (`LeakyAlg`) that emulates "leaking" 40 KB/event. Upon successful termination, the user should end up w/ a report from the service that will include (among other things) results along the lines of:
```
[...]
INFO Number of events processed: 100
INFO CPU usage per event [ms]: 100
[...]
INFO Leak estimate per event Pss: 40.00 KB
[...]
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/47138Fix chosenBin instead of Fatal in TFCSEnergyBinParametrization::simulate()2021-10-25T18:32:43+02:00Jonathan BossioFix chosenBin instead of Fatal in TFCSEnergyBinParametrization::simulate()Fix the way `chosenBin` is randomly chosen in TFCSEnergyBinParametrization::simulate() (for the case the randomly-generated number is not within [0,1)).
@mduehrss @mfauccig @ahasibFix the way `chosenBin` is randomly chosen in TFCSEnergyBinParametrization::simulate() (for the case the randomly-generated number is not within [0,1)).
@mduehrss @mfauccig @ahasibhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47136Fix typo for sTGC_RegSelCondAlg2021-10-13T15:42:08+02:00Thomas StreblerFix typo for sTGC_RegSelCondAlgThis MR fixes a typo in the RegionSelector configuration impacting the muon reconstruction configuration, identified by @nstyles. While noticed originally with Run-4 configurations, it is unclear if it also affects the Run-3 CA configura...This MR fixes a typo in the RegionSelector configuration impacting the muon reconstruction configuration, identified by @nstyles. While noticed originally with Run-4 configurations, it is unclear if it also affects the Run-3 CA configuration.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47135AllConfigFlags: do not delete flag creation function2021-10-13T15:45:58+02:00Frank WinklmeierAllConfigFlags: do not delete flag creation functionFor unit testing, it is often useful to be able to re-create the
`ConfigFlags` from scratch to be able to test with different settings
(e.g. different input files). This can now be done via:
```
from AthenaConfiguration.AllConfigFlags im...For unit testing, it is often useful to be able to re-create the
`ConfigFlags` from scratch to be able to test with different settings
(e.g. different input files). This can now be done via:
```
from AthenaConfiguration.AllConfigFlags import _createCfgFlags
ConfigFlags = _createCfgFlags()
```
cc @wlampl @tbold: I am open for better suggestions, i.e. if we should drop the `_`. But maybe this way it's clear this should only be used by experts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47131porting fixes from pilot run branch to master and other clean up (ATR-22904, ...2021-10-13T15:43:43+02:00Daniele Zanziporting fixes from pilot run branch to master and other clean up (ATR-22904, ATR-22905)trigger menu fixestrigger menu fixeshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47130InDetExtensionProcessor+InDetTrackValidation+TrkGaussianSumFilter: Protect TS...2021-10-13T15:46:17+02:00Scott SnyderInDetExtensionProcessor+InDetTrackValidation+TrkGaussianSumFilter: Protect TSOS objects.Memory-protect the TSOS objects we allocate.
Temporary(?) change to try to track down ATLASRECTS-6331.Memory-protect the TSOS objects we allocate.
Temporary(?) change to try to track down ATLASRECTS-6331.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47129Several fixes in RDBAccessSvc2021-10-13T15:46:37+02:00Vakhtang TsulaiaSeveral fixes in RDBAccessSvc1. Avoid useless calls to `connect()` and `disconnect()` functions from `getRecordsetPtr()`. Partially addresses rare threading issues reported in ATR-24282
2. Migrate from `std::lock_guard` to `std::scoped_lock`
3. Minor code optimizations1. Avoid useless calls to `connect()` and `disconnect()` functions from `getRecordsetPtr()`. Partially addresses rare threading issues reported in ATR-24282
2. Migrate from `std::lock_guard` to `std::scoped_lock`
3. Minor code optimizationshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47128LArCalibTools+LArCalibUtils+LArCondAthenaPool: Remove references to LArRoI_Map.2021-10-13T15:42:31+02:00Scott SnyderLArCalibTools+LArCalibUtils+LArCondAthenaPool: Remove references to LArRoI_Map.Remove obsolete/unneeded references to LArRoI_Map.Remove obsolete/unneeded references to LArRoI_Map.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47127MuonCalibIdentifier: Enable thread-safety checking.2021-10-13T15:44:31+02:00Scott SnyderMuonCalibIdentifier: Enable thread-safety checking.Enable thread-safety checking.
Fix warnings.Enable thread-safety checking.
Fix warnings.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47126TileGeoModel+TileEvent: const fixes2021-10-13T15:43:58+02:00Scott SnyderTileGeoModel+TileEvent: const fixesSeparate const and non-const access to TileCablingService.
Non-const accesses should use getInstance_nc and be marked as not thread-safe.Separate const and non-const access to TileCablingService.
Non-const accesses should use getInstance_nc and be marked as not thread-safe.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47125MuonReadoutGeometry: Enable thread-safety checking.2021-10-13T15:42:47+02:00Scott SnyderMuonReadoutGeometry: Enable thread-safety checking.Enable thread-safety checking.Enable thread-safety checking.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47124StripGeoModelXml: cmake fix2021-10-13T15:44:35+02:00Scott SnyderStripGeoModelXml: cmake fixMissing find_package for GeoModelCore.Missing find_package for GeoModelCore.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47123AthContainers: Add AuxStoreConstMem.2021-10-13T21:45:23+02:00Scott SnyderAthContainers: Add AuxStoreConstMem.Add AuxStoreConstMem, an implementation of IConstAuxStore that references
external buffers rather than managing memory itself.Add AuxStoreConstMem, an implementation of IConstAuxStore that references
external buffers rather than managing memory itself.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47122NSW Trigger RDO merging tool2021-10-21T19:46:02+02:00Stefano RosatiNSW Trigger RDO merging toolAdding to the NSW L1 trigger simulation a tool to emulate the NSW Trigger Processor.
The tool is merging the output RDO of the STGC trigger sim and the output RDO of the MM trigger simulation.
For the moment only prepare the output of t...Adding to the NSW L1 trigger simulation a tool to emulate the NSW Trigger Processor.
The tool is merging the output RDO of the STGC trigger sim and the output RDO of the MM trigger simulation.
For the moment only prepare the output of the pad trigger sim for the integration with the sector logic.
Also, update of the NSW trigger RDO to match the data fragment content.
Tagging @masato , @junpei