calo: use geo. add XCentre and YCentre
sim: gofmt