RE3/1 and RE4/1 extended geometry

* Include RE3/1 and RE4/1 (eta range unchanged)
* Include RE3/1 and RE4/1 (eta 2.4)
* Update numbering for both
* Update geometry scenarios