athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-07-16T15:42:23+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/55143Increase test time of MuonSegmentFindingConfigTest2022-07-16T15:42:23+02:00Tadej Novaktadej.novak@cern.chIncrease test time of MuonSegmentFindingConfigTestIncrease test time of `MuonSegmentFindingConfigTest` to 450 to help debug builds.Increase test time of `MuonSegmentFindingConfigTest` to 450 to help debug builds.Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/551492022-07-15: Daily merge of 22.0 into master2022-07-16T15:42:12+02:00Tadej Novaktadej.novak@cern.ch2022-07-15: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-07-15T2101` into ~master. No conflicts!Merging `nightly/22.0/2022-07-15T2101` into ~master. No conflicts!Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/552372022-07-19: Daily merge of 22.0 into master2022-08-01T22:07:18+02:00Walter Lampl2022-07-19: Daily merge of 22.0 into masterDaily merge of 22.0 into master
Conflicts resolved: version.txt files, MR !55145Daily merge of 22.0 into master
Conflicts resolved: version.txt files, MR !55145Walter LamplWalter Lamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/552772022-07-20: Daily merge of 22.0 into master2022-07-20T21:42:16+02:00Walter Lampl2022-07-20: Daily merge of 22.0 into masterManually resolved conflict in /DataQuality/DataQualityConfigurations/config/LArMonitoring/collisions_run.config
Related to discussion https://gitlab.cern.ch/atlas/athena/-/merge_requests/54645#note_5823154Manually resolved conflict in /DataQuality/DataQualityConfigurations/config/LArMonitoring/collisions_run.config
Related to discussion https://gitlab.cern.ch/atlas/athena/-/merge_requests/54645#note_5823154Walter LamplWalter Lamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/51508Add CP::AsgUnionSelectionAlg2022-07-21T19:48:37+02:00Tadej Novaktadej.novak@cern.chAdd CP::AsgUnionSelectionAlgAdd `CP::AsgUnionSelectionAlg` intended to provide selection of the minimal subset of particles that pass at least one systematics. It uses similar functionality as what I implemented for OverlapRemoval - it adds a systematically aware d...Add `CP::AsgUnionSelectionAlg` intended to provide selection of the minimal subset of particles that pass at least one systematics. It uses similar functionality as what I implemented for OverlapRemoval - it adds a systematically aware decoration.
`CP::AsgSelectionAlg` has also been updated not to require the tool if one just wants to make a summary selection based on multiple preselections.
Will add tests/examples later.
/cc @krumnack @jburr @mmuskinj @strichtehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55216Merging SUSY19 and SUSY20 formats2022-07-22T09:43:11+02:00Kaito SugizakiMerging SUSY19 and SUSY20 formatsDerivation update for compressed EWK SUSY searches. Added variables and skimming necessary for displaced track search and 1L1T search.Derivation update for compressed EWK SUSY searches. Added variables and skimming necessary for displaced track search and 1L1T search.Kaito SugizakiKaito Sugizakihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/553112022-07-21: Daily merge of 22.0 into master2022-07-24T16:45:47+02:00Walter Lampl2022-07-21: Daily merge of 22.0 into masterConflicts resolved:
- version.txt files
- TrackingCommonConfig.pyConflicts resolved:
- version.txt files
- TrackingCommonConfig.pyWalter LamplWalter Lamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55385TCT: Adding two new tests with 13.6 TeV stable beams collisions2022-07-24T20:12:48+02:00Peter BertaTCT: Adding two new tests with 13.6 TeV stable beams collisionsAdding bulk and express processing tests with stable-beams collisions into TCT. Using the latest settings.
The output comparison for bulk processing is now done with 200 events.
Then later a general cleanup is needed for TCT tests, but ...Adding bulk and express processing tests with stable-beams collisions into TCT. Using the latest settings.
The output comparison for bulk processing is now done with 200 events.
Then later a general cleanup is needed for TCT tests, but for now it would be good to have these two new tests.
Tagging @tadej and @jmaurerPeter BertaPeter Bertahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/553842022-07-22/23/24: Daily merge of 22.0 into master2022-07-25T15:42:42+02:00Walter Lampl2022-07-22/23/24: Daily merge of 22.0 into masterManually resolve conflicts in
- MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
- InnerDetector/InDetConfig/python/TrackingCommonConfig.pyManually resolve conflicts in
- MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
- InnerDetector/InDetConfig/python/TrackingCommonConfig.pyWalter LamplWalter Lamplhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/554182022-07-26: daily merge of 22.0 into master2022-07-28T09:27:23+02:00Frank Winklmeier2022-07-26: daily merge of 22.0 into masterMerge of ~22.0 to ~master:
- rejected updates to `version.txt`
- rejected conflicts due to ~"alsoTargeting:22.0" from !55394Merge of ~22.0 to ~master:
- rejected updates to `version.txt`
- rejected conflicts due to ~"alsoTargeting:22.0" from !55394Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55481Revert "LArRecUtils: update LArFCalTowerBuilderTool reference"2022-07-28T21:43:26+02:00Frank WinklmeierRevert "LArRecUtils: update LArFCalTowerBuilderTool reference"This reverts commit a1a0c76e016e0636129acc000ec655e55e819a85 from the
last daily merge (!55418) to fix unit test failure in nightly.This reverts commit a1a0c76e016e0636129acc000ec655e55e819a85 from the
last daily merge (!55418) to fix unit test failure in nightly.Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/554832022-07-28: daily merge of 22.0 into master2022-07-28T21:43:25+02:00Frank Winklmeier2022-07-28: daily merge of 22.0 into master- rejected changes to InDetPhysValMonitoring (!55440)
- rejected changes to project versions- rejected changes to InDetPhysValMonitoring (!55440)
- rejected changes to project versionsFrank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/555212022-07-29: daily merge of 22.0 into master2022-07-29T15:46:20+02:00Frank Winklmeier2022-07-29: daily merge of 22.0 into master* rejected changes to OldFlags2NewFlags* rejected changes to OldFlags2NewFlagsFrank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55596Revert "Merge branch 'add-base-xaod-container' into '22.0'"2022-08-02T21:55:16+02:00Julien MaurerRevert "Merge branch 'add-base-xaod-container' into '22.0'"This reverts merge request !55448 suspected to cause timeout in the 2022-08-01T2101 nightly of branch 22.0.This reverts merge request !55448 suspected to cause timeout in the 2022-08-01T2101 nightly of branch 22.0.Julien MaurerJulien Maurerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55640Daily "22.0 to master" sweep: 03/08/222022-08-04T03:43:01+02:00Vakhtang TsulaiaDaily "22.0 to master" sweep: 03/08/22Merge conflicts:
- Several `version.txt` files
- Two minor conflicts in the `PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss` package caused by manual sweep of !55324 into ~22.0. Retained the master version of the code.
...Merge conflicts:
- Several `version.txt` files
- Two minor conflicts in the `PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss` package caused by manual sweep of !55324 into ~22.0. Retained the master version of the code.
- Conflict generated by `Tools/PROCTools/data/x658_AOD_content.ref` which has been removed from master, but still exists in ~22.0. Ignored ~22.0 changes.
- Minor conflicts related to !55502 in two files: `InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py` and `Reconstruction/tauRec/python/TauToolHolder.py`. Kept the master version of the code after discussion with the developers
Manual fixes have bee applied to two files `InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py` and `Reconstruction/VKalVrt/VrtSecInclusive/python/VrtSecInclusiveConfig.py`
as per [these instructions](https://gitlab.cern.ch/atlas/athena/-/merge_requests/55502#note_5870421)https://gitlab.cern.ch/atlas/athena/-/merge_requests/55722Daily "22.0 to master" sweep: 08/08/222022-08-09T15:43:06+02:00Adam Edward BartonDaily "22.0 to master" sweep: 08/08/22```
Conflicts:
theirs MuonSpectrometer/MuonIdHelpers/src/CscIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/MmIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/RpcIdH...```
Conflicts:
theirs MuonSpectrometer/MuonIdHelpers/src/CscIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/MmIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/RpcIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/TgcIdHelper.cxx
theirs MuonSpectrometer/MuonIdHelpers/src/sTgcIdHelper.cxx
ours Projects/Athena/version.txt
ours Projects/DetCommon/version.txt
theirs Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
```Adam Edward BartonAdam Edward Bartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55739DerivationFrameworkBPhys: Fix debug build2022-08-10T03:42:17+02:00Adam Edward BartonDerivationFrameworkBPhys: Fix debug buildAn extra include is needed for the debug buildAn extra include is needed for the debug buildAdam Edward BartonAdam Edward Bartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55795Daily "22.0 to master" sweep: 10/08/222022-08-11T15:43:51+02:00Adam Edward BartonDaily "22.0 to master" sweep: 10/08/22Yesterday's sweep (!55747) didn't pass tests so let's skip that one and merge this one if it passes.
No conflicts that were not auto merged.Yesterday's sweep (!55747) didn't pass tests so let's skip that one and merge this one if it passes.
No conflicts that were not auto merged.Adam Edward BartonAdam Edward Bartonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55710LAr SC HV corr computation2022-08-12T11:04:46+02:00Pavol StrizenecLAr SC HV corr computationThis should add possibility, to compute the HV corrections for the LAr digital trigger.
Also some cleanup and fixes for code used to compute, store and dump HV corrections for both main readout and digital trigger one.
Code is not used i...This should add possibility, to compute the HV corrections for the LAr digital trigger.
Also some cleanup and fixes for code used to compute, store and dump HV corrections for both main readout and digital trigger one.
Code is not used in the standard workflows, only in the conditions manipulations jobs.Pavol StrizenecPavol Strizenechttps://gitlab.cern.ch/atlas/athena/-/merge_requests/55841Daily "22.0 to master" sweep: 11/08/222022-08-12T09:43:31+02:00Adam Edward BartonDaily "22.0 to master" sweep: 11/08/22Merge made by the 'ort' strategy. No conflicts after using merge script.Merge made by the 'ort' strategy. No conflicts after using merge script.Adam Edward BartonAdam Edward Barton