Let SpaceCharge code know about EastOff and WestOff
Merge branch 'cvs' into hft-dev