Russell Owen & Paul Price: In reinstating this function, I realized it is a bit odd as its only real job is to delegate to joinMatchListWithCatalog(). That function lives in anetBasicAstrometry.py, so even if the caller has initialized AstrometryTask, calling this function still requires initializing an ANetBasicAstrometryTask. I've come up with two solutions and have pushed branches for both:
Just adds back the function in its own file and slightly simplifies the API (i.e. it has the caller pass in the matches and source lists themselves rather than reloading them here through a passed in butler).
Moves joinMatchListWithCatalog() to setMatchDistance.py. The user can either pass in their own astrometry task instance, or one will be created for them. This has the advantage that one no longer needs to go through ANetBasicAstrometryTask to get to joinMatchListWithCatalog(). It also comes with the added bonus that the (adapted) unittest SourceMatchJoin.py already provides a unit test. Note that I also made the following filename changes:
setMatchDistance.py -> matchUtils.py
SourceMatchJoin.py -> testJoinMatchListWithCatalog.py
I prefer the latter, but if you have strong opinions either way, let me know. I'll wait until we've settled on one or the other solution before officially putting this up for review (shout if you can/are willing to take it!).
Oh, and a Jenkins build was successful on the u/lauren/