Sweeping !54910 from master to 21.0. fix variable name
fix variable name
See merge request !54910 (merged); automatic sweep failed because !54851 (merged) (that will introduce the bug) hasn't been merged yet
(cherry picked from commit c0a27c5d)
6e003d22 fix pixel numbers, deposited charge