Merge remote-tracking branch 'upstream/master'

Calorimeter/CaloDigiAlgs/CMakeLists.txt

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h

Calorimeter/FaserCaloSimEvent/CMakeLists.txt

Calorimeter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHit.h

...ter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHitIdHelper.h

Calorimeter/FaserCaloSimEvent/src/CaloHit.cxx

Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx

Control/CalypsoConfiguration/python/DetectorConfigFlags.py

Control/CalypsoConfiguration/python/testDetectorFlags.py

Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py

...alypsoExample/Digitization/scripts/faserMDC_digi_merge.py

Control/CalypsoExample/Digitization/scripts/faser_digi.py

...lypsoExample/Digitization/scripts/submit_faserMDC_digi.sh

...xample/Digitization/scripts/submit_faserMDC_digi_merge.sh

Control/CalypsoExample/Generation/CMakeLists.txt

...ation/data/mdc/FaserMC-MDC_FS_Aee_100MeV_1Em5-110001.json

...ration/data/mdc/FaserMC-MDC_FS_Aee_10MeV_1Em4-110003.json

...ration/data/mdc/FaserMC-MDC_FS_Aee_10MeV_1Em5-110002.json