Ok, this is all working now. There are now separate loaders for astrometry and photometry. The reference catalog for either one can be set by setting a config: -c astromRefCat="gaia" or "ps1" for astrometric plots/metrics (or photomRefCat for photometry, but we only ever use ps1 for photometric calibration at this point...and the code will let you know that if you try setting it otherwise!). The defaults match our current settings for processing, so gaia_dr2_20200414 for astrometry and ps1_pv3_3pi_20170110 for photometry. The match plots indicate which catalog was used for the reference catalog so it will be clear what you are looking at. For example, this astrometric metric used gaia:
whereas this photometric one used ps1:
I am running the scripts on the w_2021_02 RC2 run and all looks good with the jointcal fix of
DM-28233. The following compares it with the v21_0_0_rc1 run and demonstrates (in a slightly more round-about route than Eli Rykoff showed on DM-28173!) the offsets between the two reference catalogs
If there are any other plots you would like to look at, they can be found here which was run using the defaults. Just to make sure it works, I also ran with -c astromRefCat="ps1" and those plots can be found here.