Merged Suchandra's SiPhase2Digitizer