Bugfix in tof placement

It is discovered in issue2446 that the tof is placed incorrectely in some setups. This fixes the issue. Corrects placement in both v21a and v20c geometries.