Merge branch 'CSADigitizer' of https://gitlab.cern.ch/ruizdaza/allpix-squared into CSADigitizer