From aa64dbdd3e507d179443f55c3b69cbcfc8f8eca0 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 1 Jun 2022 15:53:41 -0700 Subject: [PATCH 1/3] Disable masking on cutouts The masking, particularly circular masking for a circle cutout, is very compute-intensive and takes much too long, even if tuned down to an octagon. Disable masking for DP0.2. We can revisit later with a more performant algorithm. --- src/vocutouts/workers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vocutouts/workers.py b/src/vocutouts/workers.py index ebd8070..e632d24 100644 --- a/src/vocutouts/workers.py +++ b/src/vocutouts/workers.py @@ -214,7 +214,7 @@ def cutout( # Perform the cutout. logger.info("Starting cutout request") try: - result = backend.process_uuid(sky_stencils[0], uuid) + result = backend.process_uuid(sky_stencils[0], uuid, mask_plane=None) except Exception as e: logger.exception("Cutout processing failed") msg = f"Error Cutout processing failed\n{type(e).__name__}: {str(e)}" From 290f82073539d939589b9c08acbb8c45ebe3cfda Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 1 Jun 2022 16:14:34 -0700 Subject: [PATCH 2/3] Remove duplicate logging from worker We were already logging success of the cutout, and adding more logging meant logging it twice. Remove the duplicate, but keep the logging when starting the cutout. --- src/vocutouts/workers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vocutouts/workers.py b/src/vocutouts/workers.py index e632d24..aa5d55e 100644 --- a/src/vocutouts/workers.py +++ b/src/vocutouts/workers.py @@ -219,7 +219,6 @@ def cutout( logger.exception("Cutout processing failed") msg = f"Error Cutout processing failed\n{type(e).__name__}: {str(e)}" raise TaskTransientError(msg) - logger.info("Cutout request completed") # Return the result URL. This must be a dict representation of a # vocutouts.uws.models.JobResult. From 5cf373cf8c3ba751d40639f142878bbbf71cbd20 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 1 Jun 2022 16:22:46 -0700 Subject: [PATCH 3/3] Add CHANGELOG entry for masking change --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6bd355b..b567bc5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ Change log ########## +0.4.1 (unreleased) +================== + +- Stop masking pixels outside the cutout stencil. + The current performance of masking is unreasonably slow for ``CIRCLE`` cutouts, and masking isn't required by the SODA standard. + We may revisit this later with a faster algorithm. + 0.4.0 (2022-05-31) ==================