Merge branch 'sweep_24.0_main_2024-03-04' into 'main' (6a34a6f8) · Commits · William Frederick George / athena

Commit 6a34a6f8 authored 1 year ago by Vakhtang Tsulaia

Merge branch 'sweep_24.0_main_2024-03-04' into 'main'

2024-03-04: merge of 24.0 into main

See merge request atlas/athena!69483

parents 6270e92e d48d71f4

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py 2 additions, 0 deletions

Calorimeter/CaloCondPhysAlgs/python/CaloScaleNoiseConfig.py
Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_MC.py 4 additions, 0 deletions

Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_MC.py
Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py 1 addition, 16 deletions

.../AthenaMonitoring/share/DataQualitySteering_jobOptions.py
DataQuality/DataQualityInterfaces/python/han.py 6 additions, 1 deletion

DataQuality/DataQualityInterfaces/python/han.py
DataQuality/DataQualityInterfaces/src/HanConfig.cxx 3 additions, 3 deletions

DataQuality/DataQualityInterfaces/src/HanConfig.cxx
DataQuality/DataQualityInterfaces/src/han.cxx 2 additions, 0 deletions

DataQuality/DataQualityInterfaces/src/han.cxx
DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter/src/GeoExporter.cxx 0 additions, 8 deletions

...oModel/GeoModelStandalone/GeoExporter/src/GeoExporter.cxx
InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/python/InDetBeamSpotFinderConfig.py 43 additions, 11 deletions

...s/InDetBeamSpotFinder/python/InDetBeamSpotFinderConfig.py
InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/scripts/runBeamSpotCalibration.py 114 additions, 0 deletions

...lgs/InDetBeamSpotFinder/scripts/runBeamSpotCalibration.py
InnerDetector/InDetExample/InDetBeamSpotExample/bin/beamSpotT0_Vertex_tf.py 1 addition, 1 deletion

...tExample/InDetBeamSpotExample/bin/beamSpotT0_Vertex_tf.py
InnerDetector/InDetExample/InDetBeamSpotExample/bin/beamspotman.py 4 additions, 1 deletion

...ctor/InDetExample/InDetBeamSpotExample/bin/beamspotman.py
InnerDetector/InDetExample/InDetBeamSpotExample/bin/plotBeamSpotMon.py 3 additions, 0 deletions

.../InDetExample/InDetBeamSpotExample/bin/plotBeamSpotMon.py
InnerDetector/InDetExample/InDetBeamSpotExample/python/JobRunner.py 5 additions, 1 deletion

...tor/InDetExample/InDetBeamSpotExample/python/JobRunner.py
InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py 13 additions, 6 deletions

...MonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py
LArCalorimeter/LArBadChannelTool/share/LArBuildBadChannelDB.sh 4 additions, 2 deletions

...lorimeter/LArBadChannelTool/share/LArBuildBadChannelDB.sh
LArCalorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h 3 additions, 0 deletions

...alorimeter/LArCalibTools/LArCalibTools/LArDigits2Ntuple.h
LArCalorimeter/LArCalibTools/LArCalibTools/LArPhysWaveFromStdNtuple.h 10 additions, 13 deletions

...er/LArCalibTools/LArCalibTools/LArPhysWaveFromStdNtuple.h
LArCalorimeter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py 2 additions, 0 deletions

...ter/LArCalibTools/python/LArCalib_HVScale2NtupleConfig.py
LArCalorimeter/LArCalibTools/python/LArPhysWaveFromStdNtupleConfig.py 108 additions, 0 deletions

...er/LArCalibTools/python/LArPhysWaveFromStdNtupleConfig.py
LArCalorimeter/LArCalibTools/share/LArPhysWaveFromStdNtuple2Pool_jobOptions.py 0 additions, 167 deletions

...ibTools/share/LArPhysWaveFromStdNtuple2Pool_jobOptions.py

with 328 additions and 230 deletions

Please register or to comment

Admin message

Merge branch 'sweep_24.0_main_2024-03-04' into 'main'