Now able to iterate over pinhole geometries