athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-10-06T15:42:48+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46952TileConditions: Improve handling of TileCablingService singleton.2021-10-06T15:42:48+02:00Scott SnyderTileConditions: Improve handling of TileCablingService singleton.Ideally we should just create TileCablingService fully initialized and not expose
a non-const accessor. However, there's many pieces of code scattered
around that want to twiddle pieces of it; getting rid of those would
entail a signifi...Ideally we should just create TileCablingService fully initialized and not expose
a non-const accessor. However, there's many pieces of code scattered
around that want to twiddle pieces of it; getting rid of those would
entail a significant redesign. For now, separate const and non-const
access, and tag the non-const access as not thread-safe.
Temporarily, getInstance is still returning a non-const pointer.
This is to change once all downstream clients have been migrated.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46774adding efficiencies and a bug fix for residuals for MM offline DQ2021-10-06T15:45:15+02:00Michela Bigliettiadding efficiencies and a bug fix for residuals for MM offline DQadding efficiencies and a bug fix for residual calculations for MM offline DQadding efficiencies and a bug fix for residual calculations for MM offline DQhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46944LArHVCondAlg, LArHVPathologyDBCondALg: Retrieve the CaloDetDescrManager from ...2021-10-06T21:44:48+02:00Walter LamplLArHVCondAlg, LArHVPathologyDBCondALg: Retrieve the CaloDetDescrManager from CondStoreThis is part of the migration of all clients of the CaloDetDescrManager, cc @tsulaiaThis is part of the migration of all clients of the CaloDetDescrManager, cc @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46421Adding isolation variables to electron and photons in HLT at TrigEDM2021-10-06T21:42:44+02:00Fernando MonticelliAdding isolation variables to electron and photons in HLT at TrigEDMThis MR is to make the decorations made by the TrackIsolation tool available on electrons and photons at HLT, which are needed for DataQuality, Monitoring and debugging.
Relates to ATR-23728This MR is to make the decorations made by the TrackIsolation tool available on electrons and photons at HLT, which are needed for DataQuality, Monitoring and debugging.
Relates to ATR-23728https://gitlab.cern.ch/atlas/athena/-/merge_requests/46955CaloCellDetPos keep only methods that the CaloDetDescrManager is passed.2021-10-06T21:42:35+02:00Christos Anastopouloschristos.anastopoulos@cern.chCaloCellDetPos keep only methods that the CaloDetDescrManager is passed.CaloCellDetPos keep only methods that the CaloDetDescrManager is passed.
Modify the Calo D3PD code to use these and retrieve the manager via CondHandle.CaloCellDetPos keep only methods that the CaloDetDescrManager is passed.
Modify the Calo D3PD code to use these and retrieve the manager via CondHandle.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46822CaloRec: Move to retrieve CaloDetDescManager from CondStore, part 12021-10-06T21:43:21+02:00Walter LamplCaloRec: Move to retrieve CaloDetDescManager from CondStore, part 1In this MR: Change `CaloCellContainerFromClusterTool` and `CaloThinCellsByClusterAlg` to retrieve `CaloDetDescManager` from `CondStore`
The last remaining client in this package is `CaloTowerxAODAlgoBase`. This one is tricky b/c is use...In this MR: Change `CaloCellContainerFromClusterTool` and `CaloThinCellsByClusterAlg` to retrieve `CaloDetDescManager` from `CondStore`
The last remaining client in this package is `CaloTowerxAODAlgoBase`. This one is tricky b/c is uses the `CaloDetDescrManager` to cache stuff in initialize. I suspect this algo is actually obsolete (replaced by `CaloTopoTowerFromClusterMaker`) but this is to be verified.
ping @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46951JetTagCalibration: migrate trigger use-case to CA2021-10-06T21:42:40+02:00Frank WinklmeierJetTagCalibration: migrate trigger use-case to CAMigrate the trigger "scheme" of `JetTagCalibConfig` to CA-based
configuration. Based on the comments, this had been attempted before.
For it to work one needs to make use of `appendCAtoAthena` in the
trigger menu code, but take care of h...Migrate the trigger "scheme" of `JetTagCalibConfig` to CA-based
configuration. Based on the comments, this had been attempted before.
For it to work one needs to make use of `appendCAtoAthena` in the
trigger menu code, but take care of handling the main algorithms
separately.
Delete the unused `ConfigFlags.BTagging.Run3NewTrigTaggers` flag
and remove the work-around from `runHLT_standalone.py` as now everything
is setup correctly within the bjet trigger menu sequence.
Finally, also cleanup the offline use-case by using
`addFoldersSplitOnline` which handles the connection names correctly.
cc @cnasshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46966TrigEDMConfig: write HLT tau track impact parameters to AOD2021-10-07T14:29:38+02:00Bertrand Martin Dit LatourTrigEDMConfig: write HLT tau track impact parameters to AODHello,
This MR is adding HLT tau track impact parameters and significances (4 new floats per track) to the Run3 trigger EDM file, for one container (`HLT_tautrack_MVA`), so that these variables are available in AOD.
These variables are ...Hello,
This MR is adding HLT tau track impact parameters and significances (4 new floats per track) to the Run3 trigger EDM file, for one container (`HLT_tautrack_MVA`), so that these variables are available in AOD.
These variables are dynamic variables that will be needed to train RNN tau ID for Run3 tau triggers: `d0TJVA`, `d0SigTJVA`, `z0sinthetaTJVA`, `z0sinthetaSigTJVA`.
The others in the list are static Aux variables that were already kept by default.
The only Aux variable not appearing in the list is `bdtScores`, which is no longer used in R22 (neither offline nor online).
From 40 q221 events,
```
checkFile myAOD.pool.root | grep HLT_tautrack_MVA
1.400 kb 0.311 kb 0.008 kb 0.000 40 (B) HLT_tautrack_MVA
16.202 kb 1.406 kb 0.035 kb 0.000 40 (B) HLT_tautrack_MVAAuxDyn.viewIndex
6.772 kb 3.437 kb 0.086 kb 0.000 40 (B) HLT_tautrack_MVAAuxDyn.d0TJVA
6.826 kb 3.443 kb 0.086 kb 0.000 40 (B) HLT_tautrack_MVAAuxDyn.z0sinthetaSigTJVA
6.812 kb 3.448 kb 0.086 kb 0.000 40 (B) HLT_tautrack_MVAAuxDyn.z0sinthetaTJVA
6.787 kb 3.459 kb 0.086 kb 0.000 40 (B) HLT_tautrack_MVAAuxDyn.d0SigTJVA
74.975 kb 12.182 kb 0.305 kb 0.000 40 (B) HLT_tautrack_MVAAux.
```
Hopefully the size increase is acceptable.
For completeness, I have updated the q221 digest reference file to reflect the new AOD content, although currently the CI test seems to [ignore the L1 and HLT trigger content](https://gitlab.cern.ch/atlas-sit/CI/-/blob/master/TestConfig/q221xAODDigestTest.citest#L84).
I guess that's why people don't bother updating this file when the trigger content changes, and must explain why non-tau trigger changes are reported.
Tagging @ademaria , @iriu , @okuprash .
Cheers,
Bertrandhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/4697122.0-TSoS_unique_ptr-TRT_TrackHoleSearch2021-10-06T21:44:38+02:00Shaun Roe22.0-TSoS_unique_ptr-TRT_TrackHoleSearchconvert to using unique_ptr version of TSoS constructor. work undertaken in context of ATLASRECTS-6384.convert to using unique_ptr version of TSoS constructor. work undertaken in context of ATLASRECTS-6384.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46933TrkTrackSlimmingTool: Workaround for protected TrackStateOnSurface2021-12-18T15:02:43+01:00Scott SnyderTrkTrackSlimmingTool: Workaround for protected TrackStateOnSurfaceTo track down ATLASRECTS-6331, we want to write-protect TrackStateOnSurface
objects held by a DataVector.
Unfortunately, TrackSlimmingTool in some cases casts away const from TSOS
objects read from SG and modifies them. This will fail ...To track down ATLASRECTS-6331, we want to write-protect TrackStateOnSurface
objects held by a DataVector.
Unfortunately, TrackSlimmingTool in some cases casts away const from TSOS
objects read from SG and modifies them. This will fail hard if the objects
are write-protected.
Ultimately, we should just get rid of this workflow.
But for now, work around by unprotecting memory before we change it,
if needed, and then protect it again afterwards.
We check before and after that the pointer in TSOS hasn't gotten
trashed.
Temporary to try to track down ATLASRECTS-6331https://gitlab.cern.ch/atlas/athena/-/merge_requests/46921AGDDControl+AGDDKernel+AGDDHandlers+AGDD2GeoSvc: Thread-safety fixes for AGDD...2021-10-06T21:43:24+02:00Scott SnyderAGDDControl+AGDDKernel+AGDDHandlers+AGDD2GeoSvc: Thread-safety fixes for AGDDControl.Enable thread-safety checking in AGDDControl.
Remove static data + other cleanups.Enable thread-safety checking in AGDDControl.
Remove static data + other cleanups.https://gitlab.cern.ch/atlas/athena/-/merge_requests/4697022.0-cleanup-TRT_TrackExtensionTool_xk2021-10-06T21:45:04+02:00Shaun Roe22.0-cleanup-TRT_TrackExtensionTool_xkconvert return type of rioOnTrackSimple to return unique_ptr, and use this for unique_ptr form of TrackStateOnSurface constructor. Work undertaken in context of ATLASRECTS-6384.convert return type of rioOnTrackSimple to return unique_ptr, and use this for unique_ptr form of TrackStateOnSurface constructor. Work undertaken in context of ATLASRECTS-6384.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46973Filter out TrigPassBits, 1st pass on features based compression2021-10-06T21:43:39+02:00Tomasz BoldFilter out TrigPassBits, 1st pass on features based compressionThis MR has two parts:
1) ignores TrigPassBits when comparing FEA vectors (increases chance of mergin)
2) has 1s attack to merge ConvProxies that have features (basically factor of 10 reduction of number of conv proxies)
By default, the...This MR has two parts:
1) ignores TrigPassBits when comparing FEA vectors (increases chance of mergin)
2) has 1s attack to merge ConvProxies that have features (basically factor of 10 reduction of number of conv proxies)
By default, the compression is off by default no to to interfere with the conversion of ConvProxies to IM / H that is the critical piece.
Tagging @wprzygod and @tamartinhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46975PyJobTransforms: Fix logging message of ExeWrap_tf.py2021-10-06T21:42:49+02:00Johannes ElmsheuserPyJobTransforms: Fix logging message of ExeWrap_tf.pyFix a logging message bug in ExeWrap_tf.py.Fix a logging message bug in ExeWrap_tf.py.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46976PerfMonComps: Avoid manual heap allocation that needs by-hand cleanup2021-10-06T21:42:38+02:00Alaettin Serhan MetePerfMonComps: Avoid manual heap allocation that needs by-hand cleanupA basic improvement to the memory management in `PerfMonMTSvc`.A basic improvement to the memory management in `PerfMonMTSvc`.https://gitlab.cern.ch/atlas/athena/-/merge_requests/46969LArPileUpTool: Retrieve CaloDetDescrManager from CondStore2021-10-07T08:37:27+02:00Walter LamplLArPileUpTool: Retrieve CaloDetDescrManager from CondStorePart of the effort to migrated all clients of CaloDetDescrManager.
cc @tsulaiaPart of the effort to migrated all clients of CaloDetDescrManager.
cc @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46962AnalysisTop:adding muon isolation breakdown systematics2021-10-06T21:45:37+02:00Merve SahinsoyAnalysisTop:adding muon isolation breakdown systematicsAdding Muon Isolation Breakdown systematics and removing the boolean flag to distinguish isolation systematics from the restAdding Muon Isolation Breakdown systematics and removing the boolean flag to distinguish isolation systematics from the resthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46989Switched LArHitsTestTool to reading CaloDetDescrManager from the Detector Store2021-10-08T02:14:32+02:00Vakhtang TsulaiaSwitched LArHitsTestTool to reading CaloDetDescrManager from the Detector StoreThis patch is required for fixing failed ART test, which broke because of the
latest update in `LArHitsTestTool`. In the long term, though, we need to revisit
the `CaloDetDescrManager` usage patterns in Simulation in order to determine w...This patch is required for fixing failed ART test, which broke because of the
latest update in `LArHitsTestTool`. In the long term, though, we need to revisit
the `CaloDetDescrManager` usage patterns in Simulation in order to determine whether
it is really needed to construct it by the converter at initialization.
Fixes ATLASSIM-5432https://gitlab.cern.ch/atlas/athena/-/merge_requests/46939PROCTools: Add nTauTracks and nTauJets to the xAODDigest outputs2021-10-07T15:31:37+02:00Johannes ElmsheuserPROCTools: Add nTauTracks and nTauJets to the xAODDigest outputsAdd nTauTracks and nTauJets to the xAODDigest outputs.
This will automatically checked in the CI tests `q431xAODDigestTest.citest` and `q221xAODDigestTest.citest`
Tagging @martindl, @emoyse, @goetz @mhodgkin for infoAdd nTauTracks and nTauJets to the xAODDigest outputs.
This will automatically checked in the CI tests `q431xAODDigestTest.citest` and `q221xAODDigestTest.citest`
Tagging @martindl, @emoyse, @goetz @mhodgkin for infohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46985FSLRT ART Test Offline2021-10-07T09:44:57+02:00Benjamin Philip KerridgeFSLRT ART Test OfflineThe offline test for FSLRT was broken as the data file used was not being placed in the job directory. This MR fixes that.
Related JIRA: ATR-24111The offline test for FSLRT was broken as the data file used was not being placed in the job directory. This MR fixes that.
Related JIRA: ATR-24111