Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2025-01-16 (2b1caf2a) · Commits · atlas / athena

Commit 2b1caf2a authored 1 month ago by Vakhtang Tsulaia

Browse files

Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2025-01-16

parents 389f8ada c37f62a9

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

DataQuality/DataQualityConfigurations/config/NSW/collisions_minutes10.config 1 addition, 0 deletions

...lityConfigurations/config/NSW/collisions_minutes10.config
DataQuality/DataQualityConfigurations/config/NSW/collisions_run.config 59 additions, 0 deletions

...ataQualityConfigurations/config/NSW/collisions_run.config
DataQuality/DataQualityConfigurations/config/NSW/cosmics_minutes10.config 1 addition, 0 deletions

...QualityConfigurations/config/NSW/cosmics_minutes10.config
DataQuality/DataQualityConfigurations/config/NSW/cosmics_run.config 1 addition, 0 deletions

...y/DataQualityConfigurations/config/NSW/cosmics_run.config
DataQuality/DataQualityConfigurations/config/NSW/heavyions_minutes10.config 1 addition, 0 deletions

...alityConfigurations/config/NSW/heavyions_minutes10.config
DataQuality/DataQualityConfigurations/config/NSW/heavyions_run.config 1 addition, 0 deletions

...DataQualityConfigurations/config/NSW/heavyions_run.config
LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py 8 additions, 7 deletions

LArCalorimeter/LArMonitoring/python/LArSuperCellMonAlg.py
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/MuonNSWSegmentFinderTool.cxx 51 additions, 11 deletions

...Tools/DCMathSegmentMaker/src/MuonNSWSegmentFinderTool.cxx
MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/MuonNSWSegmentFinderTool.h 3 additions, 1 deletion

...erTools/DCMathSegmentMaker/src/MuonNSWSegmentFinderTool.h
MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py 4 additions, 0 deletions

...onDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/NSWRawDataMonitoring/CMakeLists.txt 1 addition, 1 deletion

...MuonRawDataMonitoring/NSWRawDataMonitoring/CMakeLists.txt
MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/NSWRawDataMonitoring/python/NSWMonitorAlgorithm.py 31 additions, 5 deletions

...toring/NSWRawDataMonitoring/python/NSWMonitorAlgorithm.py
MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/NSWRawDataMonitoring/src/NSWDataMonAlg.cxx 121 additions, 9 deletions

...DataMonitoring/NSWRawDataMonitoring/src/NSWDataMonAlg.cxx
MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/NSWRawDataMonitoring/src/NSWDataMonAlg.h 6 additions, 2 deletions

...awDataMonitoring/NSWRawDataMonitoring/src/NSWDataMonAlg.h
Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat 14 additions, 14 deletions

...ysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref 581 additions, 775 deletions

...n/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py 7 additions, 7 deletions

...alidation/TrigInDetValidation/python/TrigInDetArtSteps.py
Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py 2 additions, 2 deletions

...alidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py
Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json 9 additions, 9 deletions

.../TrigValidation/TrigInDetValidation/share/comparitor.json
Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref 169 additions, 395 deletions

...gValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

with 1071 additions and 1238 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2025-01-16