Reverted changes to high granularity hit merging

Michele Faucci Giannellirequested to merge
mfauccig/athena:fcs_rel22 into master

These changes allow producing the first set of input samples for the AF3 parameterization in Run3

Merge request reports