Merge remote-tracking branch 'upstream/master'

Calorimeter/CaloRecAlgs/CMakeLists.txt

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx

Calorimeter/CaloRecAlgs/src/CaloRecAlg.h

Calorimeter/CaloRecTools/CMakeLists.txt

Calorimeter/CaloRecTools/CaloRecTools/ICaloRecTool.h

Calorimeter/CaloRecTools/python/CaloRecToolConfig.py

Calorimeter/CaloRecTools/src/CaloRecTool.cxx

Calorimeter/CaloRecTools/src/CaloRecTool.h

...eter/CaloRecTools/src/components/CaloRecTools_entries.cxx

Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py

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

Control/CalypsoExample/Digitization/scripts/faser_digi.py

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

.../data/mdc/FaserMC-MDC_PG_muon_fasernu_1000GeV-101312.json

...n/data/mdc/FaserMC-MDC_PG_muon_fasernu_100GeV-101310.json

...on/data/mdc/FaserMC-MDC_PG_muon_fasernu_10GeV-101308.json

...n/data/mdc/FaserMC-MDC_PG_muon_fasernu_300GeV-101311.json

...on/data/mdc/FaserMC-MDC_PG_muon_fasernu_30GeV-101309.json

.../data/mdc/FaserMC-MDC_PG_pion_fasernu_1000GeV-121106.json