We decide to keep the old geometry v20a for consistency and create instead a new geometry tag v20b for the default tof geometry. To be consistent we also have to revert to the old version of the macro.