Revised data objects

Removed Boland.CH and Boland.mask and replaced with
Boland.CH1 and Boland.mask1 and Boland.CH2 and Boland.mask2