the fix on gTower mapping

Chiao-Ying Linrequested to merge
cylin/athena:21.3_FixMapping into 21.3

The gTower forward mapping was temporary by storing all supercells as individual towers.

This fix is to group supercells into proper towers

Merge request reports