Started also filling a histos.root output
Merge remote-tracking branch 'origin/DiamondTestbeam' into DiamondTestbeam