athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-08-16T03:42:33+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/559052022-08-14: Daily merge of 22.0 into master2022-08-16T03:42:33+02:00Tadej Novaktadej.novak@cern.ch2022-08-14: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-14T2101` into ~master. No conflicts!Merging `nightly/22.0/2022-08-14T2101` into ~master. No conflicts!Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559242022-08-15: Daily merge of 22.0 into master2022-08-17T03:43:20+02:00Tadej Novaktadej.novak@cern.ch2022-08-15: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-15T2101` into ~master.
Conflicts (always taken newest):
- `MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx`
- `MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/MuonPRDCacheCreator.cxx`
- `Muo...Merging `nightly/22.0/2022-08-15T2101` into ~master.
Conflicts (always taken newest):
- `MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx`
- `MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/MuonPRDCacheCreator.cxx`
- `MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/MuonTesterBranch.h`
- `MuonSpectrometer/MuonValidation/MuonTesterTree/Root/MuonTesterBranch.cxx`
- `Simulation/Digitization/python/DigitizationSteering.py`
Fixed compilation issues:
- `Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx`
/cc @jchapman @jojungge @lmijovicTadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559492022-08-16: Daily merge of 22.0 into master2022-08-17T09:42:36+02:00Tadej Novaktadej.novak@cern.ch2022-08-16: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-16T2101` into ~master. No conflicts!
Reverted !55921 due to compilation errors as sweep was not done properly (so not really needed).Merging `nightly/22.0/2022-08-16T2101` into ~master. No conflicts!
Reverted !55921 due to compilation errors as sweep was not done properly (so not really needed).Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/559812022-08-17: Daily merge of 22.0 into master2022-08-18T09:43:24+02:00Tadej Novaktadej.novak@cern.ch2022-08-17: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-17T2101` into ~master.
The only conflicts were `version.txt` files.Merging `nightly/22.0/2022-08-17T2101` into ~master.
The only conflicts were `version.txt` files.Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/560212022-08-18: Daily merge of 22.0 into master2022-08-19T15:43:24+02:00Tadej Novaktadej.novak@cern.ch2022-08-18: Daily merge of 22.0 into masterMerging `nightly/22.0/2022-08-18T2101` into ~master. No conflicts!Merging `nightly/22.0/2022-08-18T2101` into ~master. No conflicts!Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/560722022-08-22: Weekend merge of 22.0 into master2022-08-24T09:42:34+02:00Tadej Novaktadej.novak@cern.ch2022-08-22: Weekend merge of 22.0 into masterMerging `nightly/22.0/2022-08-22T2101` into ~master (includes also `r19`, `r20` and `r21`).
Conflicts:
- `version.txt`
- `PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusV0Cascade.cxx` (kept ~master version)
- `...Merging `nightly/22.0/2022-08-22T2101` into ~master (includes also `r19`, `r20` and `r21`).
Conflicts:
- `version.txt`
- `PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/JpsiPlusV0Cascade.cxx` (kept ~master version)
- `Reconstruction/RecJobTransforms/python/RecoConfigFlags.py` (kept ~master version)
- `Reconstruction/VKalVrt/VrtSecInclusive/python/VrtSecInclusiveConfig.py` (made sure imports are properly updated)
- `Tools/WorkflowTestRunner/python/References.py` (copied references to master and bumped revisions)Tadej Novaktadej.novak@cern.chTadej Novaktadej.novak@cern.chhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/561602022-08-24: merge of 22.0 into master2022-08-24T21:42:41+02:00Johannes Elmsheuser2022-08-24: merge of 22.0 into masterDaily sweep/merge of 22.0 branch into master branch.
Used `git merge --strategy-option ours upstream/22.0` to resolve merge conflicts in:
```
Projects/VP1Light/version.txt
Projects/DetCommon/version.txt
Projects/Athena/version.txt
Pro...Daily sweep/merge of 22.0 branch into master branch.
Used `git merge --strategy-option ours upstream/22.0` to resolve merge conflicts in:
```
Projects/VP1Light/version.txt
Projects/DetCommon/version.txt
Projects/Athena/version.txt
Projects/AthSimulation/version.txt
Projects/AthDataQuality/version.txt
PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py
```
Used `git cherry-pick 91c42b977d1f54c3a74bfbb13b3c7787f9f7926e` for `PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/python/PHYSVAL.py` and manually resolved a merge conflict.Johannes ElmsheuserJohannes Elmsheuserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/561902022-08-25: merge of 22.0 into master2022-08-25T15:42:24+02:00Johannes Elmsheuser2022-08-25: merge of 22.0 into masterDaily sweep/merge of 22.0 branch into master branch.
Used `Used git merge upstream/22.0`.
Manually resolved merge conflicts in:
```
Control/AthenaConfiguration/python/AllConfigFlags.py
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/pyt...Daily sweep/merge of 22.0 branch into master branch.
Used `Used git merge upstream/22.0`.
Manually resolved merge conflicts in:
```
Control/AthenaConfiguration/python/AllConfigFlags.py
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py
```Johannes ElmsheuserJohannes Elmsheuserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/562332022-08-26: merge of 22.0 into master2022-08-26T15:46:46+02:00Johannes Elmsheuser2022-08-26: merge of 22.0 into masterDaily sweep/merge of 22.0 branch into master branch.
Used `git merge --strategy-option ours upstream/22.0` to give preference to the master branch code in the 4 merge conflicts of:
```
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/pytho...Daily sweep/merge of 22.0 branch into master branch.
Used `git merge --strategy-option ours upstream/22.0` to give preference to the master branch code in the 4 merge conflicts of:
```
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
Control/AthenaConfiguration/python/AllConfigFlags.py
```
@tdado and @lshi could you please check if the InDetJiveXML related updates are correct since you simultaneously edited these files in the master and 22.0 branch.Johannes ElmsheuserJohannes Elmsheuserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/562772022-08-26: merge of 22.0 into master #22022-08-26T21:42:05+02:00Johannes Elmsheuser2022-08-26: merge of 22.0 into master #2Daily sweep/merge of 22.0 branch into master branch number #2 for 2022-08-26.
Used `git merge --strategy-option ours upstream/22.0` to give preference to the master branch code in merge conflicts of:
```
Tracking/Acts/ActsTrkTools/ActsT...Daily sweep/merge of 22.0 branch into master branch number #2 for 2022-08-26.
Used `git merge --strategy-option ours upstream/22.0` to give preference to the master branch code in merge conflicts of:
```
Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/python/ActsTrkSeedingToolConfig.py
Projects/VP1Light/version.txt
Projects/DetCommon/version.txt
Projects/Athena/version.txt
Projects/AthSimulation/version.txt
Projects/AthDataQuality/version.txt
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
Control/AthenaConfiguration/python/AllConfigFlags.py
```Johannes ElmsheuserJohannes Elmsheuserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/562902022-08-27: merge of 22.0 into master2022-08-27T21:42:00+02:00Johannes Elmsheuser2022-08-27: merge of 22.0 into masterDaily sweep/merge of 22.0 branch into master branch for 2022-08-27.
Used `git merge --strategy-option theirs upstream/22.0` to give preference to the 22.0 branch code in merge conflicts of:
```
InnerDetector/InDetEventCnv/InDetJiveXML/s...Daily sweep/merge of 22.0 branch into master branch for 2022-08-27.
Used `git merge --strategy-option theirs upstream/22.0` to give preference to the 22.0 branch code in merge conflicts of:
```
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.h
InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
```Johannes ElmsheuserJohannes Elmsheuserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/563402022-08-29: daily merge of 22.0 into master2022-08-30T09:42:06+02:00Frank Winklmeier2022-08-29: daily merge of 22.0 into masterNo conflicts.No conflicts.Frank WinklmeierFrank Winklmeierhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/563892022-08-31: daily merge of 22.0 into master2022-08-31T15:43:19+02:00Frank Winklmeier2022-08-31: daily merge of 22.0 into masterDisabled AOD output checks in q449.Disabled AOD output checks in q449.https://gitlab.cern.ch/atlas/athena/-/merge_requests/564332022-09-01: daily merge of 22.0 into master2022-09-01T21:42:38+02:00Frank Winklmeier2022-09-01: daily merge of 22.0 into masterDaily merge. No conflicts.Daily merge. No conflicts.https://gitlab.cern.ch/atlas/athena/-/merge_requests/564912022-09-03: daily merge of 22.0 into master2022-09-04T21:42:34+02:00Frank Winklmeier2022-09-03: daily merge of 22.0 into masterFix trivial conflicts in CITest and AllConfigFlags.pyFix trivial conflicts in CITest and AllConfigFlags.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/565072022-09-05: daily merge of 22.0 into master2022-09-06T15:42:38+02:00Adam Edward Barton2022-09-05: daily merge of 22.0 into masterNo conflicts after smart mergingNo conflicts after smart merginghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/565382022-09-06: daily merge of 22.0 into master2022-09-07T09:42:03+02:00Adam Edward Barton2022-09-06: daily merge of 22.0 into master Conflicts:
Control/AthToolSupport/AsgExampleTools/CMakeLists.txt
resolved by hand Conflicts:
Control/AthToolSupport/AsgExampleTools/CMakeLists.txt
resolved by handhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/565732022-09-07: daily merge of 22.0 into master2022-09-08T15:43:40+02:00Adam Edward Barton2022-09-07: daily merge of 22.0 into master```
Conflicts:
Control/AthenaConfiguration/python/AllConfigFlags.py
PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionCombined.cxx
PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionFormul...```
Conflicts:
Control/AthenaConfiguration/python/AllConfigFlags.py
PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionCombined.cxx
PhysicsAnalysis/AnalysisCommon/IsolationSelection/Root/IsolationConditionFormula.cxx
Simulation/Tests/ISF_ValidationMT/test/test_MC21a_FullG4MT_QS_Monopoles_CAvsCG.sh
Tools/PyUtils/python/MetaReader.py
Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
```
Resolved by hand. I hope as intended.https://gitlab.cern.ch/atlas/athena/-/merge_requests/566342022-09-08: daily merge of 22.0 into master2022-09-10T09:42:08+02:00Adam Edward Barton2022-09-08: daily merge of 22.0 into masterno conflictsno conflictshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/566062022-09-08: daily merge of 22.0 into master2022-09-09T09:42:27+02:00Adam Edward Barton2022-09-08: daily merge of 22.0 into masterNo ConflictsNo Conflicts