Merge branch 'master' into 'master-AFP-DQM-Nikola' (41d07ab0) · Commits · atlas / athena

Commit 41d07ab0 authored 4 years ago by Kristin Lohwasser

Merge branch 'master' into 'master-AFP-DQM-Nikola'

# Conflicts:
#   ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h
#   ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPToFAlgorithm.h
#   ForwardDetectors/AFP/Run3AFPMonitoring/python/Run3AFPExampleMonitorAlgorithm.py
#   ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPFastReco.cxx
#   ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
#   ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPToFAlgorithm.cxx

parents f44f8cfb 003c7a86

8 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!36664AFP DQM [rel 22],!36035AFP Run3 merge request - added automatic check,!32548AFP Run3 Monitoring DQ Data Quality - changes in python file

Hide whitespace changes

Inline Side-by-side

Showing with 43 additions and 54 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment