Merging of digitizer from upgrade and current detector
Merging of digitizer from upgrade and current detector