Resolving the internal overlaps in files:

21e - maximum deflection 21f - no deflection adding 3.3 AGeV and 12 AGeV, both without the internal overlaps 21g - 3.3 AGeV configuration 21h - 12 AGeV configuration