From 006f6d2bf60694e1984d56eec800ee66e0d83036 Mon Sep 17 00:00:00 2001 From: NatLeung96 Date: Tue, 1 Sep 2026 10:13:26 +0100 Subject: [PATCH 1/2] rename p99 ptypy input file path --- ptypy/config/p99_dm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ptypy/config/p99_dm.yaml b/ptypy/config/p99_dm.yaml index aca07b4..8fa1eb1 100755 --- a/ptypy/config/p99_dm.yaml +++ b/ptypy/config/p99_dm.yaml @@ -64,19 +64,19 @@ parameter_tree: auto_center: true save: null intensities: - file: /%(visit_path)s/p99-%(run)s.nxs + file: /%(visit_path)s/p99-bs-%(run)s.nxs key: /entry/andor2_det/andor2_det positions: - file: /%(visit_path)s/p99-%(run)s.nxs + file: /%(visit_path)s/p99-bs-%(run)s.nxs fast_key: /entry/andor2_det/sample_stage-x fast_multiplier: 0.001 slow_key: /entry/andor2_det/sample_stage-y slow_multiplier: 0.001 recorded_energy: - file: /%(visit_path)s/p99-%(run)s.nxs + file: /%(visit_path)s/p99-bs-%(run)s.nxs key: /entry/plan_metadata/energy/value multiplier: 0.001 recorded_distance: - file: /%(visit_path)s/p99-%(run)s.nxs + file: /%(visit_path)s/p99-bs-%(run)s.nxs key: /entry/plan_metadata/detector_dist/value multiplier: 0.001 From 77d69ad29bad4eda9bd95cc94155c0677198171c Mon Sep 17 00:00:00 2001 From: Yousef Moazzam Date: Fri, 11 Sep 2026 12:51:15 +0100 Subject: [PATCH 2/2] Add workflow for generating multi-page tiff artifacts Solely for development, to have a workflow in staging that has a multi-page tiff artifact. --- .../templates/generate-multi-page-tiff.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 httomo/templates/generate-multi-page-tiff.yaml diff --git a/httomo/templates/generate-multi-page-tiff.yaml b/httomo/templates/generate-multi-page-tiff.yaml new file mode 100644 index 0000000..c612bb9 --- /dev/null +++ b/httomo/templates/generate-multi-page-tiff.yaml @@ -0,0 +1,42 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ClusterWorkflowTemplate +metadata: + name: generate-multi-page-tiff + labels: + workflows.diamond.ac.uk/science-group-imaging: "true" + annotations: + workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows" +spec: + entrypoint: generate-multi-page-tiff + volumeClaimTemplates: + - metadata: + name: tmpdir + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 1Gi + storageClassName: netapp + templates: + - name: generate-multi-page-tiff + script: + image: ghcr.io/diamondlightsource/httomo:3.3 + command: [/opt/conda/bin/python] + source: | + from pathlib import Path + import numpy as np + import tifffile + + OUT_PATH = Path("/tmp/random-multi-page-tifffile.tif") + SHAPE = (5, 400, 400) + image_stack = np.random.random(SHAPE).astype(np.float32) + tifffile.tifffile.imwrite(OUT_PATH, image_stack) + volumeMounts: + - name: tmpdir + mountPath: /tmp + outputs: + artifacts: + - name: random-data + path: "/tmp/random-multi-page-tifffile.tif" + archive: + none: { }