Skip to content

Change centring limits #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DominicOram merged 4 commits into from
Jul 1, 2026
Merged

Change centring limits #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab81522
Change centring limits
DominicOram Jun 30, 2026
49b147c
Fix accidentally added print statement
DominicOram Jun 30, 2026
ddde124
Fix test
DominicOram Jul 1, 2026
7f6b557
Merge branch 'main' into change_centring_limits
DominicOram Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 60 additions & 69 deletions docs/reference/rest_api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,16 @@
"type": "null"
}
]
},
"opa": {
"anyOf": [
{
"$ref": "#/components/schemas/OpaConfig"
},
{
"type": "null"
}
]
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -900,54 +910,6 @@
],
"title": "DeviceManagerSource"
},
"DeviceSource": {
"properties": {
"module": {
"type": "string",
"title": "Module",
"description": "Module to be imported"
},
"kind": {
"type": "string",
"const": "deviceFunctions",
"title": "Kind",
"default": "deviceFunctions"
}
},
"additionalProperties": false,
"type": "object",
"required": [
"module"
],
"title": "DeviceSource"
},
"DodalSource": {
"properties": {
"module": {
"type": "string",
"title": "Module",
"description": "Module to be imported"
},
"kind": {
"type": "string",
"const": "dodal",
"title": "Kind",
"default": "dodal"
},
"mock": {
"type": "boolean",
"title": "Mock",
"description": "If true, ophyd_async device connections are mocked",
"default": false
}
},
"additionalProperties": false,
"type": "object",
"required": [
"module"
],
"title": "DodalSource"
},
"EnvironmentConfig": {
"properties": {
"sources": {
Expand All @@ -956,38 +918,21 @@
{
"$ref": "#/components/schemas/PlanSource"
},
{
"$ref": "#/components/schemas/DeviceSource"
},
{
"$ref": "#/components/schemas/DodalSource"
},
{
"$ref": "#/components/schemas/DeviceManagerSource"
}
],
"discriminator": {
"propertyName": "kind",
"mapping": {
"deviceFunctions": "#/components/schemas/DeviceSource",
"deviceManager": "#/components/schemas/DeviceManagerSource",
"dodal": "#/components/schemas/DodalSource",
"planFunctions": "#/components/schemas/PlanSource"
}
}
},
"type": "array",
"title": "Sources",
"default": [
{
"module": "dodal.plans",
"kind": "planFunctions"
},
{
"module": "dodal.plan_stubs.wrapped",
"kind": "planFunctions"
}
]
"default": []
},
"events": {
"$ref": "#/components/schemas/WorkerEventConfig"
Expand Down Expand Up @@ -1154,9 +1099,29 @@
"OIDCConfig": {
"properties": {
"well_known_url": {
"type": "string",
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Well Known Url",
"description": "URL to fetch OIDC config from the provider"
"description": "URL to fetch OIDC config from the provider",
"deprecated": true
},
"issuer": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"title": "Issuer",
"description": "URL of OIDC provider"
},
"client_id": {
"type": "string",
Expand All @@ -1179,11 +1144,37 @@
"additionalProperties": false,
"type": "object",
"required": [
"well_known_url",
"client_id"
],
"title": "OIDCConfig"
},
"OpaConfig": {
"properties": {
"root": {
"type": "string",
"maxLength": 2083,
"minLength": 1,
"format": "uri",
"title": "Root",
"default": "http://localhost:8181/"
},
"audience": {
"type": "string",
"title": "Audience",
"default": "account"
},
"tiled_service_account_check": {
"type": "string",
"title": "Tiled Service Account Check"
}
},
"additionalProperties": false,
"type": "object",
"required": [
"tiled_service_account_check"
],
"title": "OpaConfig"
},
"PlanSource": {
"properties": {
"module": {
Expand Down
2 changes: 1 addition & 1 deletion src/daq_queuing_service/plugins/i15_1_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def construct_blueapi_tasks_from_i15_1_experiment(
),
TaskRequest(
name="centre_sample",
params={"start_z": -5, "end_z": 5, "steps": 20, "exposure_time": 0.01},
params={"start_z": -20, "end_z": 0, "steps": 20, "exposure_time": 0.01},
instrument_session=experiment.instrument_session,
),
TaskRequest(
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/plugins/test_i15_1_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def test_sample_centre_uses_expected_params():
tasks = construct_blueapi_tasks_from_i15_1_experiment(experiment)
assert tasks[1].name == "centre_sample"
assert tasks[1].params == {
"start_z": -5,
"end_z": 5,
"start_z": -20,
"end_z": 0,
"steps": 20,
"exposure_time": 0.01,
}
Expand Down
Loading