CPV,PHS: code reduction and fix in digitization #22794

Job	Run time
PR formatting / clang-format	23s
PR formatting / copyright headers	14s
PR formatting / line endings	22s
PR formatting / pragma-once	6s
PR formatting / whitespace	13s
	1m 18s

Provide feedback