From 73193cd81e3b33e1f4d88f644546afe24515288d Mon Sep 17 00:00:00 2001 From: Hsin-Fang Chiang Date: Tue, 19 Nov 2024 14:07:38 -0800 Subject: [PATCH 1/2] Update the ComCam skymap to lsst_cells_v1 --- applications/prompt-proto-service-lsstcomcam/README.md | 2 +- applications/prompt-proto-service-lsstcomcam/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/prompt-proto-service-lsstcomcam/README.md b/applications/prompt-proto-service-lsstcomcam/README.md index 81edb0b954..f4334af2ea 100644 --- a/applications/prompt-proto-service-lsstcomcam/README.md +++ b/applications/prompt-proto-service-lsstcomcam/README.md @@ -34,7 +34,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th | prompt-proto-service.instrument.pipelines.main | string | None, must be set | Machine-readable string describing which pipeline(s) should be run for which visits. Notation is complex and still in flux; see [the source code](https://github.com/lsst-dm/prompt_processing/blob/main/python/activator/config.py) for examples. | | prompt-proto-service.instrument.pipelines.preprocessing | string | None, must be set | Machine-readable string describing which pipeline(s) should be run before which visits' raw arrival. | | prompt-proto-service.instrument.preloadPadding | int | `30` | Number of arcseconds to pad the spatial region in preloading. | -| prompt-proto-service.instrument.skymap | string | `"ops_rehersal_prep_2k_v1"` | Skymap to use with the instrument | +| prompt-proto-service.instrument.skymap | string | `"lsst_cells_v1"` | Skymap to use with the instrument | | prompt-proto-service.knative.cpuLimit | int | `1` | The maximum cpu cores for the full pod (see `containerConcurrency`). | | prompt-proto-service.knative.cpuRequest | int | `1` | The cpu cores requested for the full pod (see `containerConcurrency`). | | prompt-proto-service.knative.ephemeralStorageLimit | string | `"5Gi"` | The maximum storage space allowed for each container (mostly local Butler). This allocation is for the full pod (see `containerConcurrency`) | diff --git a/applications/prompt-proto-service-lsstcomcam/values.yaml b/applications/prompt-proto-service-lsstcomcam/values.yaml index a6116e6e11..85b421ac96 100644 --- a/applications/prompt-proto-service-lsstcomcam/values.yaml +++ b/applications/prompt-proto-service-lsstcomcam/values.yaml @@ -49,7 +49,7 @@ prompt-proto-service: # @default -- None, must be set preprocessing: "" # -- Skymap to use with the instrument - skymap: "ops_rehersal_prep_2k_v1" + skymap: "lsst_cells_v1" # -- Number of arcseconds to pad the spatial region in preloading. preloadPadding: 30 # -- URI to the shared repo used for calibrations, templates, and pipeline outputs. From e0c84f1381ccd45d32222147924b768937dbe993 Mon Sep 17 00:00:00 2001 From: Hsin-Fang Chiang Date: Mon, 18 Nov 2024 16:15:41 -0800 Subject: [PATCH 2/2] Update the nextVisit handling in LSSTComCam Prompt Processing BLOCK-320 is the block to perform the observations for the individual visits that are queued up by the Feature Based Scheduler. BLOCK-320 is expected to be the standard json block for taking science images with ComCam going forward. Ignore all T blocks except BLOCK-T246 for now. --- .../values-usdfprod-prompt-processing.yaml | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml b/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml index 7a6a4ee05a..6e3885b223 100644 --- a/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml +++ b/applications/prompt-proto-service-lsstcomcam/values-usdfprod-prompt-processing.yaml @@ -22,25 +22,37 @@ prompt-proto-service: # BLOCK-T60 is optics alignment # BLOCK-T75 is giant donuts # BLOCK-T88 is optics alignment + # BLOCK-T215 is evening twilight flats + # BLOCK-T216 is morning twilight flats + # BLOCK-T219 is pretty picture # BLOCK-T246 is instrument checkout # BLOCK-T249 is AOS alignment + # BLOCK-T250 is TMA daytime checkout main: >- - (survey="PP-SURVEY")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/ApPipe.yaml, + (survey="BLOCK-320")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/ApPipe.yaml, ${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/SingleFrame.yaml, ${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Isr.yaml] - (survey="BLOCK-T60")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Isr-cal.yaml] + (survey="BLOCK-T60")=[] (survey="BLOCK-T75")=[] - (survey="BLOCK-T88")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Isr-cal.yaml] + (survey="BLOCK-T88")=[] + (survey="BLOCK-T215")=[] + (survey="BLOCK-T216")=[] + (survey="BLOCK-T219")=[] (survey="BLOCK-T246")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Isr-cal.yaml] - (survey="BLOCK-T249")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Isr-cal.yaml] + (survey="BLOCK-T249")=[] + (survey="BLOCK-T250")=[] (survey="")=[] preprocessing: >- - (survey="PP-SURVEY")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Preprocessing.yaml] + (survey="BLOCK-320")=[${PROMPT_PROCESSING_DIR}/pipelines/LSSTComCam/Preprocessing.yaml] (survey="BLOCK-T60")=[] (survey="BLOCK-T75")=[] (survey="BLOCK-T88")=[] + (survey="BLOCK-T215")=[] + (survey="BLOCK-T216")=[] + (survey="BLOCK-T219")=[] (survey="BLOCK-T246")=[] (survey="BLOCK-T249")=[] + (survey="BLOCK-T250")=[] (survey="")=[] calibRepo: s3://rubin-summit-users