From 3019dcc59c6d0a23c153494ee433ef088b2feb75 Mon Sep 17 00:00:00 2001 From: frederick Date: Wed, 22 Jul 2026 17:00:00 +0100 Subject: [PATCH 1/2] trying varoius changes to see if this allows the workflows system to display the ePSIC notebook workflow --- e02/templates/Notebook.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/e02/templates/Notebook.yaml b/e02/templates/Notebook.yaml index fd9c17a..b676254 100644 --- a/e02/templates/Notebook.yaml +++ b/e02/templates/Notebook.yaml @@ -1,20 +1,20 @@ apiVersion: argoproj.io/v1alpha1 kind: ClusterWorkflowTemplate metadata: - name: Calibrate4DSTEM + name: calibrate-ptycho labels: workflows.diamond.ac.uk/science-group-imaging: "true" annotations: workflows.argoproj.io/title: Calibrate 4D STEM data workflows.argoproj.io/description: | - A utility which takes in a 4D STEM data set and outs the approximate real space pixel size, measured camera length and scan rotation (based off dpc). + A utility which takes in a 4D STEM data set and outs the approximate real space pixel size, measured camera length and scan rotation, based off dpc workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows" workflows.diamond.ac.uk/parameter-schema: | {{- .Files.Get "schema/notebook_Schema.json" | nindent 6 }} workflows.diamond.ac.uk/ui-schema: | {{- .Files.Get "schema/notebook_ui.json" | nindent 6 }} spec: - entrypoint: mount-files + entrypoint: calibration-notebook arguments: parameters: - name: visitdir @@ -112,9 +112,9 @@ spec: resources: requests: cpu: 10 - memory: 30Gi + memory: 50Gi limits: cpu: 10 - memory: 30Gi + memory: 50Gi \ No newline at end of file From 10dfe83a51ca1ccbf9df0438c7a314aea1c1a935 Mon Sep 17 00:00:00 2001 From: frederick Date: Wed, 22 Jul 2026 17:08:26 +0100 Subject: [PATCH 2/2] fixing errors: changing workflows into workflow --- e02/templates/Notebook.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/e02/templates/Notebook.yaml b/e02/templates/Notebook.yaml index b676254..e82a625 100644 --- a/e02/templates/Notebook.yaml +++ b/e02/templates/Notebook.yaml @@ -5,7 +5,7 @@ metadata: labels: workflows.diamond.ac.uk/science-group-imaging: "true" annotations: - workflows.argoproj.io/title: Calibrate 4D STEM data + workflows.argoproj.io/title: Calibrate ptycho STEM data workflows.argoproj.io/description: | A utility which takes in a 4D STEM data set and outs the approximate real space pixel size, measured camera length and scan rotation, based off dpc workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows" @@ -73,7 +73,7 @@ spec: image: gitlab.diamond.ac.uk:5050/scisoft/ptychography/dimtools/mib2x volumeMounts: - name: session - mountPath: "{{`{{ workflows.parameters.visitdir }}`}}" + mountPath: "{{`{{ workflow.parameters.visitdir }}`}}" - name: tmp mountPath: /tmp - name: software @@ -85,12 +85,12 @@ spec: OUTPUT="{{`{{workflow.parameters.visitdir}}`}}"/processing/workflows/ python -m papermill "{{`{{workflow.parameters.visitdir}}`}}"/processing/workflows/Ptycho_calibration.ipynb $OUTPUT/Calibrate-notebook.ipynb \ -p visit "{{`{{ workflow.parameters.visitdir }}`}}" - -p sample "{{`{{ workflows.parameters.sample }}`}}" - -p timestamp "{{`{{workflows.parameters.timestamp}}`}}" + -p sample "{{`{{ workflow.parameters.sample }}`}}" + -p timestamp "{{`{{workflow.parameters.timestamp}}`}}" -p maskpath /software/29042024_12bitmask2.h5 - -p outpath "{{`{{workflows.parameters.outpath}}`}}" - -p lower "{{`{{workflows.parameters.thresh_lower}}`}}" - -p upper "{{`{{workflows.parameters.thresh_upper}}`}}" + -p outpath "{{`{{workflow.parameters.outpath}}`}}" + -p lower "{{`{{workflow.parameters.thresh_lower}}`}}" + -p upper "{{`{{workflow.parameters.thresh_upper}}`}}" > $OUTPUT/papermill.log 2>&1 python -m jupyter nbconvert $OUTPUT/Calibrate-notebook.ipynb \