Clustering with general photo-z uncertainties: application to Baryon Acoustic Oscillations. Issue 3 (10th February 2022)