2022-11-11: Daily sweep of 22.0 into master (!58353) · Merge requests · atlas / athena

Merged Tadej Novak requested to merge tadej/athena:sweep-2022-11-11 into master 2 years ago

Nov 12, 2022
- Merge remote-tracking branch 'upstream/22.0' into master · ca4bacd6
  Tadej Novak authored 2 years ago
  
  Conflicts: Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
  Verified
  
  ca4bacd6
Nov 11, 2022
- Merge branch 'SortInput_CA_22.0' into '22.0' · b0818d03
  Julien Maurer authored 2 years ago
  
  Add the CA-based equivalent of postInclude.SortInput.py See merge request !58330
  b0818d03
- Add the CA-based equivalent of postInclude.SortInput.py · bc4cb5e2
  John Derek Chapman authored 2 years ago and Julien Maurer committed 2 years ago
  
  Add the CA-based equivalent of postInclude.SortInput.py
  bc4cb5e2
- Merge branch 'cherry-pick-88eb6b5b -22.0' into '22.0' · a0985551
  Julien Maurer authored 2 years ago
  
  Sweeping !58292 from master to 22.0. 23.0-cppcheck-ISF_PunchThroughTools See merge request !58326
  a0985551
- Merge branch 'cherry-pick-7f3a16ef -22.0' into '22.0' · 5524771b
  Julien Maurer authored 2 years ago
  
  Sweeping !58198 from master to 22.0. Delete internal data of ComponentAccumulator before launching the c++ application See merge request !58313
  5524771b
- Sweeping !58198 from master to 22.0. · 38548aaf
  Atlas Nightlybuild authored 2 years ago and Julien Maurer committed 2 years ago
  
  Delete internal data of ComponentAccumulator before launching the c++ application Merge branch 'cleanCA' into 'master' Delete internal data of ComponentAccumulator before launching the c++ application See merge request !58198 (cherry picked from commit 7f3a16ef) 18069918 Delete internal data of ComponentAccumulator before launching the c++ application a2c7c7c1 EventInfoCnv_test.py, BeamEffectsAlgConfig.py: Don't use ComponentAccumulator after running it d9d991ad ISF_FastCaloSimServicesTestHelpers.py: Don't use ComponentAccumulator after running it
  38548aaf
- Merge branch 'ATLASRECTS-7366 ' into '22.0' · 2a7090b9
  Julien Maurer authored 2 years ago
  
  MuonClusterSegmentFinder - Introduce rough pointing cut in phi See merge request !58311
  2a7090b9
- MuonClusterSegmentFinder - Introduce rough pointing cut in phi · 1f011f72
  Johannes Junggeburth authored 2 years ago and Julien Maurer committed 2 years ago
  
  MuonClusterSegmentFinder - Introduce rough pointing cut in phi
  1f011f72
- Merge branch 'Add_VKal_debug_output' into '22.0' · bfc8ac34
  Julien Maurer authored 2 years ago
  
  More VKal debug output See merge request !58304
  bfc8ac34
- More VKal debug output · 0dee6529
  Vadim Kostyukhin authored 2 years ago and Julien Maurer committed 2 years ago
  
  More VKal debug output Add iteration number limit to debug output
  0dee6529
- Merge branch 'Update_NVSI_calibration' into '22.0' · 80577367
  Julien Maurer authored 2 years ago
  
  Update NVSI calibration See merge request !58301
  80577367
- Update NVSI calibration · 453d1147
  Vadim Kostyukhin authored 2 years ago and Julien Maurer committed 2 years ago
  
  Update NVSI calibration Use new 2-track vertex calibration file
  453d1147
- Merge branch 'cherry-pick-9a00f83f -22.0' into '22.0' · 231bab05
  Julien Maurer authored 2 years ago
  
  Sweeping !58233 from master to 22.0. ISF_FastCaloSimEvent: Fix cppcheck warnings. See merge request !58295
  231bab05
- Merge branch 'TrkConfigNov11' into '22.0' · 325d611a
  Julien Maurer authored 2 years ago
  
  Properly set MatEffects property in tracking CA configs See merge request !58294
  325d611a
- Properly set MatEffects property in tracking CA configs · bbeac0ae
  Thomas Strebler authored 2 years ago and Julien Maurer committed 2 years ago
  
  Properly set MatEffects property in tracking CA configs
  bbeac0ae
- Merge branch 'tstreble-22.0-patch-57792' into '22.0' · f68753fe
  Julien Maurer authored 2 years ago
  
  Updated track cutLevel + materialInteractions CA flags See merge request !58287
  f68753fe
- Updated track cutLevel + materialInteractions CA flags · 73d01749
  Thomas Strebler authored 2 years ago and Julien Maurer committed 2 years ago
  
  Updated track cutLevel + materialInteractions CA flags
  73d01749
- Merge branch 'CA_LUCID' into '22.0' · f9ac95b5
  Julien Maurer authored 2 years ago
  
  Add Lucid to RecoSteering See merge request !58241
  f9ac95b5
- Add Lucid to RecoSteering · cb972b31
  Walter Lampl authored 2 years ago and Julien Maurer committed 2 years ago
  
  Add Lucid to RecoSteering
  cb972b31
- Merge branch 'EmulatedTowers_v2' into '22.0' · d182ed63
  John Kenneth Anders authored 2 years ago
  
  Adding jFex tower emulator See merge request !58218
  d182ed63
- Adding jFex tower emulator · 325c4fb4
  Sergi Rodriguez Bosca authored 2 years ago and John Kenneth Anders committed 2 years ago
  
  Adding jFex tower emulator
  325c4fb4
- Merge branch 'bphys-tier0-monitoring' into '22.0' · 7732c434
  John Kenneth Anders authored 2 years ago
  
  TrigInDetMonitoring: Tier0 monitoring for Bphysics triggers See merge request !58242
  7732c434
- TrigInDetMonitoring: Tier0 monitoring for Bphysics triggers · 422baf9d
  Julia Frances Allen authored 2 years ago and John Kenneth Anders committed 2 years ago
  
  TrigInDetMonitoring: Tier0 monitoring for Bphysics triggers Update to TIDAMonitoring.py to include tier0 monitoring for Bmumux trigger chains. Specifically looking for Bmumux_BsmumuPhi chains as using pdgID=531. Future possible update to include a list of pdgID. Relevant JIRA: ATR-24877
  422baf9d
- Merge branch '23.0-cppcheck-ISF_PunchThroughTools' into 'master' · da077926
  Tadej Novak authored 2 years ago and Atlas Nightlybuild committed 2 years ago
  
  23.0-cppcheck-ISF_PunchThroughTools See merge request !58292 (cherry picked from commit 88eb6b5b) 23011a58 solve cppcheck defects
  da077926
Nov 10, 2022

Merge branch 'cppcheck.ISF_FastCaloSimEvent-20221109' into 'master' · a9ac389e

Tadej Novak authored 2 years ago and

Atlas Nightlybuild committed 2 years ago

ISF_FastCaloSimEvent: Fix cppcheck warnings.

See merge request !58233

(cherry picked from commit 9a00f83f)

9584f6f0 ISF_FastCaloSimEvent: Fix cppcheck warnings.

a9ac389e

2022-11-11: Daily sweep of 22.0 into master

Merge request reports

Activity