Merge remote-tracking branch 'origin/master' into fasermc-mc24

Calorimeter/CaloDigiAlgs/CMakeLists.txt

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h

Control/CalypsoExample/Digitization/scripts/faser_digi.py

...l/CalypsoExample/Digitization/scripts/faser_digi_merge.py

Scintillator/ScintDigiAlgs/CMakeLists.txt

Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py

Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.cxx

Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.h

...m/WaveDigiTools/WaveDigiTools/IWaveformDigitisationTool.h

...WaveDigiTools/WaveDigiTools/IWaveformDigitisationTool.icc

Waveform/WaveDigiTools/src/WaveformDigitisationTool.cxx

Waveform/WaveDigiTools/src/WaveformDigitisationTool.h