Skip to content

Odin jungfrau configuration #12

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
GDYendell merged 5 commits into from
Aug 15, 2025
Merged

Odin jungfrau configuration #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd45ed9
odin-jungfrau start.sh should reference fastcs-odin
JamesOHeaDLS Aug 11, 2025
e93b808
Add endpoint for jungfrau with port linked to idx
JamesOHeaDLS Aug 11, 2025
86bb07f
Don't store the jungfrau config file within Charts
JamesOHeaDLS Aug 11, 2025
29e9f10
Remove unused config file path from odin-jungfrau values.yaml
JamesOHeaDLS Aug 15, 2025
27e8775
Add data source endpoint to odin-jungfrau values.yaml
JamesOHeaDLS Aug 15, 2025
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
33 changes: 0 additions & 33 deletions Charts/odin-jungfrau/config/jungfrau_2_modules.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Charts/odin-jungfrau/config/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
sleep 5

# Start the IOC
fastcs-jungfrau ioc {{ .Values.pvPrefix }} --config {{ .Values.configFilePath }}
fastcs-odin ioc {{ .Values.pvPrefix }} --ip {{ .Values.detectorName }}-odin-server --port 8888
5 changes: 5 additions & 0 deletions Charts/odin-jungfrau/deployment/fp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,10 @@
}
}
}
},
{
"jungfrau": {
"endpoint": {{ .Values.endpoint }}:{{ add 8000 .idx }}
}
}
]
17 changes: 8 additions & 9 deletions Charts/odin-jungfrau/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@ pvPrefix: "LAB29-EA-JFRAU-01"
# type: string
# examples: ["jungfrau-01"]
# @schema
detectorName: "Jungfrau"

# @schema
# title: Config File Path
# description: Path to the detector's config file
# type: string
# examples: ["jungfrau.config"]
# @schema
configFilePath: "/config/jungfrau_2_modules.config"
detectorName: "jungfrau"

# @schema
# title: odin-data count
Expand All @@ -44,6 +36,13 @@ odinDataCount: 1
# @schema
detectorIp: 127.0.0.1

# @schema
# title: Data Source Endpoint
# description: The source of the data stream
# type: string
# @schema
endpoint: ""

# @schema
# title: Sensor Size Description
# description: The size of the detector sensor - e.g. "16M"
Expand Down