Fix CalibrateTask trying to write nonexistent astrometry matches.

The Gen 2 code checked whether the matches existed; the Gen 3
code did not.

python/lsst/pipe/tasks/calibrate.py

@@ -140,9 +140,9 @@ def __init__(self, *, config=None):
         if config.doPhotoCal is False:
             self.prerequisiteInputs.remove("photoRefCat")
 
-        if config.doWriteMatches is False:
+        if config.doWriteMatches is False or config.doAstrometry is False:
             self.outputs.remove("matches")
-        if config.doWriteMatchesDenormalized is False:
+        if config.doWriteMatchesDenormalized is False or config.doAstrometry is False:
             self.outputs.remove("matchesDenormalized")
 
 
@@ -162,7 +162,7 @@ class CalibrateConfig(pipeBase.PipelineTaskConfig, pipelineConnections=Calibrate
     doWriteMatches = pexConfig.Field(
         dtype=bool,
         default=True,
-        doc="Write reference matches (ignored if doWrite false)?",
+        doc="Write reference matches (ignored if doWrite or doAstrometry false)?",
     )
     doWriteMatchesDenormalized = pexConfig.Field(
         dtype=bool,
@@ -607,7 +607,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
         outputs = self.run(**inputs)
 
-        if self.config.doWriteMatches:
+        if self.config.doWriteMatches and self.config.doAstrometry:
             normalizedMatches = afwTable.packMatches(outputs.astromMatches)
             normalizedMatches.table.setMetadata(outputs.matchMeta)
             if self.config.doWriteMatchesDenormalized: