Skip to content

Commit a9dfa18

Browse files
fallarsfallars
authored
Merge pull request #248 from DiamondLightSource/main
updating branch
2 parents 720c687 + a2c52ce commit a9dfa18

42 files changed

Lines changed: 1408 additions & 85 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎e02/templates/mib2x-auto.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
workflows.argoproj.io/title: ePSIC mib automatic conversion
99
workflows.argoproj.io/description: |
1010
Convert MIB file to hdf5/hspy files
11+
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
1112
workflows.diamond.ac.uk/parameter-schema: |
1213
{{- .Files.Get "schema/mib2x_auto_Schema.json" | nindent 6 }}
1314
workflows.diamond.ac.uk/ui-schema: |

‎e02/templates/mib2x.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
workflows.argoproj.io/title: ePSIC mib conversion
99
workflows.argoproj.io/description: |
1010
Convert MIB file to hdf5/hspy files
11+
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
1112
workflows.diamond.ac.uk/parameter-schema.mib_path: |
1213
{
1314
"type": "string"

‎e02/templates/ptyrex_basic.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
workflows.argoproj.io/title: Simple Ptyrex job submission
99
workflows.argoproj.io/description: |
1010
Submit a Ptyrex job for a particular scan and projection within a given visit
11+
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
1112
workflows.diamond.ac.uk/parameter-schema: |
1213
{{- .Files.Get "schema/ptyrex_Schema.json" | nindent 6}}
1314
workflows.diamond.ac.uk/ui-schema: |

‎httomo/pipelines/visr.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
"module_path": "httomolibgpu.prep.normalize",
2222
"parameters": {
2323
"flats_multiplier": 1,
24-
"darks_multiplier": 1,
25-
"cutoff": 10
24+
"darks_multiplier": 1
2625
}
2726
},
2827
{

‎httomo/templates/cor-sweep.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1
22
kind: ClusterWorkflowTemplate
33
metadata:
44
name: httomo-cor-sweep
5+
labels:
6+
workflows.diamond.ac.uk/science-group-imaging: "true"
57
annotations:
68
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
79
workflows.diamond.ac.uk/parameter-schema.input: |

‎httomo/templates/extract-raw-projections.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1
22
kind: ClusterWorkflowTemplate
33
metadata:
44
name: extract-raw-projections
5+
labels:
6+
workflows.diamond.ac.uk/science-group-imaging: "true"
57
annotations:
68
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
79
spec:

‎httomo/templates/httomo-gpu-template-test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1
22
kind: ClusterWorkflowTemplate
33
metadata:
44
name: httomo-gpu-job
5+
labels:
6+
workflows.diamond.ac.uk/science-group-imaging: "true"
57
annotations:
68
workflows.diamond.ac.uk/repository: "https://github.com/DiamondLightSource/imaging-workflows"
79
spec:

‎i14/notebooks/ptycho-tomo-phase.ipynb‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,24 @@
8888
"cell_type": "markdown",
8989
"id": "2f61bb2f",
9090
"metadata": {},
91+
"source": [
92+
"## Set normalise boolean"
93+
]
94+
},
95+
{
96+
"cell_type": "code",
97+
"execution_count": null,
98+
"id": "e3300162-404a-4660-b4ac-136bbd517727",
99+
"metadata": {},
100+
"outputs": [],
101+
"source": [
102+
"normalise = True if normalise.lower() == \"true\" else False"
103+
]
104+
},
105+
{
106+
"cell_type": "markdown",
107+
"id": "5d23b863-a0da-40f4-aa72-c5b5cc911c00",
108+
"metadata": {},
91109
"source": [
92110
"## Initialise np array"
93111
]

‎i14/notebooks/xanes_autoprocessing0.ipynb‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"outputs": [],
1212
"source": [
13-
"# default settings\n",
13+
"# parameters\n",
1414
"inpath = \"\" # type: str\n",
1515
"outpath = \"\" # type: str\n",
1616
"edge_element = \"\" # type: str\n",
@@ -169,6 +169,22 @@
169169
"print(f\"The PNG file will be saved as {png_outpath}\")"
170170
]
171171
},
172+
{
173+
"cell_type": "markdown",
174+
"metadata": {},
175+
"source": [
176+
"### Set normalised boolean\n"
177+
]
178+
},
179+
{
180+
"cell_type": "code",
181+
"execution_count": null,
182+
"metadata": {},
183+
"outputs": [],
184+
"source": [
185+
"normalised = True if normalised.lower() == \"true\" else False"
186+
]
187+
},
172188
{
173189
"cell_type": "markdown",
174190
"metadata": {},

‎i14/notebooks/xanes_point_autoprocessing0.ipynb‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,22 @@
8484
" raise FileNotFoundError(msg)"
8585
]
8686
},
87+
{
88+
"cell_type": "markdown",
89+
"metadata": {},
90+
"source": [
91+
"### Set normalise boolean"
92+
]
93+
},
94+
{
95+
"cell_type": "code",
96+
"execution_count": null,
97+
"metadata": {},
98+
"outputs": [],
99+
"source": [
100+
"normalise = True if normalise.lower() == \"true\" else False"
101+
]
102+
},
87103
{
88104
"cell_type": "markdown",
89105
"metadata": {},

0 commit comments

Comments
 (0)