Merge branch 'Update-DAOD_IDNCB' into '21.2'

Alter hit merging in FCS_StepInfoSD.cxx to include condition that DeltaPhi of the hits (in dphi units, NOT mm units) is not larger than ~0.00025 for EMB1-EMB3

See merge request !41051 (merged)

(cherry picked from commit 5687dfe8)

955c38dc Updated DAOD_IDNCB steering b39457ca Clean comments in DAOD_IDNCB