Only delete images if we are finished with them

Work around segfault when doing afwImage.MaskedImageF(None)

Author: mfisherlevine

python/lsst/rubintv/production/slac/botTesting.py

@@ -639,7 +639,7 @@ def plotNoises(self, expRecord, timeout):
 
         return saveFile
 
-    def plotFocalPlane(self, expRecord, timeout):
+    def plotFocalPlane(self, expRecord, timeout, doNotDelete=False):
         """Create a binned mosaic of the full focal plane as a png.
 
         The binning factor is controlled via the locationConfig.binning
@@ -651,6 +651,8 @@ def plotFocalPlane(self, expRecord, timeout):
             The exposure record.
         timeout : `int`
             The timeout for waiting for the data to be complete.
+        doNotDelete : `bool`, optional
+            If True, do not delete the input data, even if it is complete.
 
         Returns
         -------
@@ -675,6 +677,7 @@ def plotFocalPlane(self, expRecord, timeout):
                              dataPath=self.locationConfig.calculatedDataPath,
                              savePlotAs=saveFile,
                              nExpected=nExpected,
+                             doNotDelete=doNotDelete,
                              timeout=timeout,
                              logger=self.log)
         self.log.info(f'Wrote focal plane plot for {expRecord.dataId} to {saveFile}')
@@ -766,6 +769,10 @@ def runCcobAnalysis(self, expRecord, timeout):
                                deleteIfComplete=False,
                                deleteRegardless=False,
                                )
+        if image is None:
+            self.log.warning(f'No mosaic found for {expRecord.dataId}')
+            return None
+
         spotInfo = analyzeCcobSpotImage(image, binning=binning)
 
         dayObs = expRecord.day_obs
@@ -842,18 +849,23 @@ def callback(self, expRecord, doPlotMosaic=False, doPlotNoises=False, doCcobAnal
         # TODO: Need some kind of wait mechanism for each of these
         if doPlotNoises:
             noiseMapFile = self.plotNoises(expRecord, timeout=timeout)
-            channel = f'{instPrefix}_noise_map'
-            self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, noiseMapFile)
+            if noiseMapFile:
+                channel = f'{instPrefix}_noise_map'
+                self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, noiseMapFile)
 
         if doPlotMosaic:
-            focalPlaneFile = self.plotFocalPlane(expRecord, timeout=timeout)
-            channel = f'{instPrefix}_focal_plane_mosaic'
-            self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, focalPlaneFile)
+            focalPlaneFile = self.plotFocalPlane(expRecord,
+                                                 timeout=timeout,
+                                                 doNotDelete=doCcobAnalysis)
+            if focalPlaneFile:
+                channel = f'{instPrefix}_focal_plane_mosaic'
+                self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, focalPlaneFile)
 
         if doCcobAnalysis:
             ccobAnalsisPlot = self.runCcobAnalysis(expRecord, timeout=timeout)
-            channel = f'{instPrefix}_ccob_analysis'
-            self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, ccobAnalsisPlot, isLiveFile=True)
+            if ccobAnalsisPlot:
+                channel = f'{instPrefix}_ccob_analysis'
+                self.uploader.uploadPerSeqNumPlot(channel, dayObs, seqNum, ccobAnalsisPlot, isLiveFile=True)
 
     def run(self):
         """Run continuously, calling the callback method with the latest

python/lsst/rubintv/production/slac/mosaicing.py

@@ -272,6 +272,7 @@ def makeMosaic(deferredDatasetRefs,
                nExpected,
                deleteIfComplete,
                deleteRegardless,
+               doNotDelete,
                logger=None):
     """Make a binned mosaic image from a list of deferredDatasetRefs.
 
@@ -297,6 +298,8 @@ def makeMosaic(deferredDatasetRefs,
         is the number which was found.
     deleteRegardless : `bool`, optional
         If True, delete the binned images regardless of how many are found.
+    doNotDelete : `bool`, optional
+        If True, do not delete the binned images after reading them.
     logger : `logging.Logger`, optional
         The logger, created if not provided.
     deleteAfterReading : `bool`
@@ -321,6 +324,11 @@ def makeMosaic(deferredDatasetRefs,
     if logger is None:
         logger = logging.getLogger(__name__)
 
+    if doNotDelete:
+        if deleteRegardless:
+            raise ValueError("doNotDelete and deleteRegardless are mutually exclusive")
+        deleteIfComplete = False
+
     instrument = camera.getName()
 
     detectorNameList = []
@@ -437,6 +445,7 @@ def plotFocalPlaneMosaic(butler,
                          timeout,
                          deleteIfComplete=True,
                          deleteRegardless=False,
+                         doNotDelete=False,
                          logger=None):
     """Save a full focal plane binned mosaic image for a given expId.
 
@@ -468,6 +477,10 @@ def plotFocalPlaneMosaic(butler,
         is the number which was found.
     deleteRegardless : `bool`, optional
         If True, delete the binned images regardless of how many are found.
+        `doNotDelete` trumps `deleteIfComplete`, but raises a ValueError if
+        used with `deleteRegardless`.
+    doNotDelete : `bool`, optional
+        If True, do not delete the binned images after reading them.
     logger : `logging.Logger`, optional
         The logger, created if not provided.
 
@@ -488,6 +501,7 @@ def plotFocalPlaneMosaic(butler,
                             timeout=timeout,
                             deleteIfComplete=deleteIfComplete,
                             deleteRegardless=deleteRegardless,
+                            doNotDelete=doNotDelete,
                             logger=logger)
 
     if mosaic is None:
@@ -507,6 +521,7 @@ def getMosaicImage(butler,
                    timeout,
                    deleteIfComplete=True,
                    deleteRegardless=False,
+                   doNotDelete=False,
                    logger=None):
     """Save a full focal plane binned mosaic image for a given expId.
 
@@ -534,6 +549,8 @@ def getMosaicImage(butler,
         is the number which was found.
     deleteRegardless : `bool`, optional
         If True, delete the binned images regardless of how many are found.
+    doNotDelete : `bool`, optional
+        If True, do not delete the binned images after reading them.
     logger : `logging.Logger`, optional
         The logger, created if not provided.
 
@@ -567,6 +584,7 @@ def getMosaicImage(butler,
                         nExpected=nExpected,
                         deleteIfComplete=deleteIfComplete,
                         deleteRegardless=deleteRegardless,
+                        doNotDelete=doNotDelete,
                         logger=logger
                         ).output_mosaic
     if mosaic is None: