Merge changes for SiPM analysis

Merged Emanuele Villa requested to merge evilla into master

Merge request reports