Made tpsd geom optimiser schema work properly
Merge branch 'new_factory' of https://github.com/muhrin/STools into new_factory