Skip to content

Commit 37c4bea

Browse files
committed
Change the output collection naming convention
1 parent 4aa8f0d commit 37c4bea

40 files changed

Lines changed: 15 additions & 14 deletions

File tree

python/shared/run_utils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_output_chain(instrument: lsst.obs.base.Instrument, date: int) -> str:
5555
The chain in which to place all output collections.
5656
"""
5757
# Order optimized for S3 bucket -- filter out as many files as soon as possible.
58-
return instrument.makeCollectionName("prompt", f"output-{date:08d}")
58+
return instrument.makeCollectionName("runs", f"prompt-{date:08d}")
5959

6060

6161
def get_preload_run(instrument: lsst.obs.base.Instrument, deployment_id: str, date: int) -> str:
@@ -105,7 +105,8 @@ def get_output_run(instrument: lsst.obs.base.Instrument,
105105
"""
106106
pipeline_name, _ = os.path.splitext(os.path.basename(pipeline_file))
107107
# Order optimized for S3 bucket -- filter out as many files as soon as possible.
108-
return "/".join([get_output_chain(instrument, date), pipeline_name, deployment_id])
108+
output_run = instrument.makeCollectionName("runs", "prompt", f"{date:08d}")
109+
return "/".join([output_run, pipeline_name, deployment_id])
109110

110111

111112
def get_day_obs(time: astropy.time.Time) -> int:

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeAssociateDiaSourceTiming_config/analyzeAssociateDiaSourceTiming_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeAssociateDiaSourceTiming_config/analyzeAssociateDiaSourceTiming_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeAssociatedDiaSourceTable_config/analyzeAssociatedDiaSourceTable_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeAssociatedDiaSourceTable_config/analyzeAssociatedDiaSourceTable_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeDiaSourceAssociationMetrics_config/analyzeDiaSourceAssociationMetrics_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeDiaSourceAssociationMetrics_config/analyzeDiaSourceAssociationMetrics_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeDiaSourceDetectionMetrics_config/analyzeDiaSourceDetectionMetrics_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeDiaSourceDetectionMetrics_config/analyzeDiaSourceDetectionMetrics_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeImageDifferenceMetrics_config/analyzeImageDifferenceMetrics_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeImageDifferenceMetrics_config/analyzeImageDifferenceMetrics_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzePreliminarySummaryStats_config/analyzePreliminarySummaryStats_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzePreliminarySummaryStats_config/analyzePreliminarySummaryStats_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/analyzeTrailedDiaSourceTable_config/analyzeTrailedDiaSourceTable_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/analyzeTrailedDiaSourceTable_config/analyzeTrailedDiaSourceTable_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/associateApdb_config/associateApdb_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/associateApdb_config/associateApdb_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

tests/data/central_repo/LSSTCam/prompt/output-20260323/ApPipe/pipelines-3ab3a6f-config-8acfde6/buildTemplate_config/buildTemplate_config_LSSTCam_prompt_output-20260323_ApPipe_pipelines-3ab3a6f-config-8acfde6.py renamed to tests/data/central_repo/LSSTCam/runs/prompt/20260324/ApPipe/pipelines-626268d-config-8acfde6/buildTemplate_config/buildTemplate_config_LSSTCam_runs_prompt_20260324_ApPipe_pipelines-626268d-config-8acfde6.py

File renamed without changes.

0 commit comments

Comments
 (0)