add aperture intersection test (r=0,n=0); fix weight calc