Manual sweep of !42154 (Fix for BIS78: do not use COOL db for efficiency and cluster size for RUN3)

Hi,

since the automatic sweep of !42154 (merged) into 21.3 and 21.9 failed, here the manual sweep.

Best, Nico