diff --git a/CHANGELOG.md b/CHANGELOG.md index b2771be7e..134476d35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Added +- Added `MAX_CUTOUT_IMAGES` to the pipeline settings to limit the number of postage stamps displayed on the source detail page [#658](https://github.com/askap-vast/vast-pipeline/pull/658). - Added run config option to skip calculating measurement pair metrics [#655](https://github.com/askap-vast/vast-pipeline/pull/655). - Added support for Python 3.10 [#641](https://github.com/askap-vast/vast-pipeline/pull/641). - Added documentation versioning [#627](https://github.com/askap-vast/vast-pipeline/pull/627). @@ -98,6 +99,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### List of PRs +- [#658](https://github.com/askap-vast/vast-pipeline/pull/658): feat: Add MAX_CUTOUT_IMAGES setting. - [#655](https://github.com/askap-vast/vast-pipeline/pull/655): feat: Add run config option to disable measurement pairs. - [#648](https://github.com/askap-vast/vast-pipeline/pull/648): fix: make Image and Measurement creation atomic together. - [#653](https://github.com/askap-vast/vast-pipeline/pull/653): fix: Allow forced fitting on images with empty catalogues. diff --git a/docs/exploringwebsite/sourcedetail.md b/docs/exploringwebsite/sourcedetail.md index 213a84470..8fd696140 100644 --- a/docs/exploringwebsite/sourcedetail.md +++ b/docs/exploringwebsite/sourcedetail.md @@ -62,7 +62,7 @@ Users are able to read and post comments on a source using this form, in additio [JS9 website](https://js9.si.edu){ target=_blank }. -More JS9 viewers are used to show the postage stamp FITS images of the measurements that are associated with the source, loaded from their respective image FITS files. +More JS9 viewers are used to show the postage stamp FITS images of the measurements that are associated with the source, loaded from their respective image FITS files. The number of cutouts to display is configurable with the `MAX_CUTOUT_IMAGES` setting: only the first `MAX_CUTOUT_IMAGES` measurements will be displayed as cutout images. A warning will be displayed if the number of displayed cutouts has been truncated. Refer to the [pipeline configuration](../gettingstarted/configuration.md#pipeline) documentation for more information. !!! note If the image data is removed from its location when the pipeline run was processed the JS9 viewer will no longer work. diff --git a/docs/gettingstarted/configuration.md b/docs/gettingstarted/configuration.md index a1ca2734a..0fd9ccbab 100644 --- a/docs/gettingstarted/configuration.md +++ b/docs/gettingstarted/configuration.md @@ -154,6 +154,7 @@ Shown below is the [`.env.template`](https://github.com/askap-vast/vast-pipeline # PIPELINE_MAINTAINANCE_MESSAGE=Uncomment and fill to show MAX_PIPELINE_RUNS=3 MAX_PIPERUN_IMAGES=200 + MAX_CUTOUT_IMAGES=30 # Q_CLUSTER_TIMEOUT=86400 # Q_CLUSTER_RETRY=86402 @@ -222,6 +223,7 @@ These settings apply to various aspects of the VAST pipeline itself. The table b | `PIPELINE_MAINTAINANCE_MESSAGE` | Disabled | The message to display at the top of the webserver. See image below this table for an example. Comment out the setting to disable. | | `MAX_PIPELINE_RUNS` | 3 | The allowed maximum number of concurrent pipeline runs. | | `MAX_PIPERUN_IMAGES` | 200 | The allowed maximum number of images in a single pipeline run (non-admins). | +| `MAX_CUTOUT_IMAGES` | 30 | The maximum number of cutout images to display on the source detail pages. The first `MAX_CUTOUT_IMAGES` cutouts are displayed, in temporal order. | | `Q_CLUSTER_TIMEOUT` | 86400 | Number of seconds a Django-Q cluster worker may spend on a task before it is terminated. See the [Django-Q documentation](https://django-q.readthedocs.io/en/latest/configure.html#timeout). | | `Q_CLUSTER_RETRY` | 86402 | Number of seconds a Django-Q broker will wait for a cluster to finish a task before it's presented again. See the [Django-Q documentation](https://django-q.readthedocs.io/en/latest/configure.html#retry). | | `Q_CLUSTER_MAX_ATTEMPTS` | 1 | Number of times a failed task is retried. See the [Django-Q documentation](https://django-q.readthedocs.io/en/latest/configure.html#max-attempts). | diff --git a/templates/source_detail.html b/templates/source_detail.html index 71db669a0..c16f2c630 100644 --- a/templates/source_detail.html +++ b/templates/source_detail.html @@ -142,7 +142,7 @@
Details
First Detection Postage Stamp
-
+
@@ -282,6 +282,13 @@
+ {% if cutout_measurements|length < datatables.0.dataQuery|length %} + + {% endif %}
@@ -290,7 +297,7 @@
- {% for measurement in datatables.0.dataQuery %} + {% for measurement in cutout_measurements %}
{{ forloop.counter0 }} @@ -458,7 +465,8 @@
Related Sources
}) -{{ datatables.0.dataQuery|json_script:"data-js9" }} +{{ cutout_measurements|json_script:"data-js9" }} +{{ first_det_meas|json_script:"data-js9-first-detection" }}