From dd45ed98fddf35d59c2ce10d4de9125c51bb58fd Mon Sep 17 00:00:00 2001 From: James O'Hea Date: Mon, 11 Aug 2025 10:03:46 +0100 Subject: [PATCH 1/5] odin-jungfrau start.sh should reference fastcs-odin --- Charts/odin-jungfrau/config/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Charts/odin-jungfrau/config/start.sh b/Charts/odin-jungfrau/config/start.sh index a718382..99ab55a 100644 --- a/Charts/odin-jungfrau/config/start.sh +++ b/Charts/odin-jungfrau/config/start.sh @@ -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 From e93b808b909b52c3013e091c60cb5bb9fdf2e433 Mon Sep 17 00:00:00 2001 From: James O'Hea Date: Mon, 11 Aug 2025 10:10:44 +0100 Subject: [PATCH 2/5] Add endpoint for jungfrau with port linked to idx --- Charts/odin-jungfrau/deployment/fp.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Charts/odin-jungfrau/deployment/fp.json b/Charts/odin-jungfrau/deployment/fp.json index 3ccd48b..89b9742 100644 --- a/Charts/odin-jungfrau/deployment/fp.json +++ b/Charts/odin-jungfrau/deployment/fp.json @@ -131,5 +131,10 @@ } } } + }, + { + "jungfrau": { + "endpoint": {{ .Values.endpoint }}:{{ add 8000 .idx }} + } } ] From 86bb07fbcad7b803118e40bea5e64f317807cd45 Mon Sep 17 00:00:00 2001 From: James O'Hea Date: Mon, 11 Aug 2025 11:46:41 +0100 Subject: [PATCH 3/5] Don't store the jungfrau config file within Charts --- .../config/jungfrau_2_modules.config | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100755 Charts/odin-jungfrau/config/jungfrau_2_modules.config diff --git a/Charts/odin-jungfrau/config/jungfrau_2_modules.config b/Charts/odin-jungfrau/config/jungfrau_2_modules.config deleted file mode 100755 index 7b08f0e..0000000 --- a/Charts/odin-jungfrau/config/jungfrau_2_modules.config +++ /dev/null @@ -1,33 +0,0 @@ -hostname lab-jf1md-00+lab-jf1md-01+ - -0:rx_tcpport 1954 -1:rx_tcpport 1955 - -rx_hostname lab29-sc-jcu01+lab29-sc-jcu01+ - -numinterfaces 1 - -0:udp_srcip 192.168.200.201 -0:udp_dstip 192.168.200.200 -0:udp_dstport 32410 -0:udp_srcmac aa:bb:cc:dd:00:00 -1:udp_srcip 192.168.200.202 -1:udp_dstip 192.168.200.200 -1:udp_srcmac aa:bb:cc:dd:00:01 -1:udp_dstport 42410 - -fwrite 0 - -rx_zmqfreq 1 -rx_zmqhwm 10000 -rx_zmqstream 1 - -temp_control 1 -temp_threshold 55 - -exptime 0.01 -pedestalmode 0 -frames 1 - -# powerchip 1 -# highvoltage 200 From 29e9f107f8579bb20492687e245016cba342150b Mon Sep 17 00:00:00 2001 From: James O'Hea Date: Fri, 15 Aug 2025 11:13:41 +0100 Subject: [PATCH 4/5] Remove unused config file path from odin-jungfrau values.yaml --- Charts/odin-jungfrau/values.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Charts/odin-jungfrau/values.yaml b/Charts/odin-jungfrau/values.yaml index 1c00a15..9158ee2 100644 --- a/Charts/odin-jungfrau/values.yaml +++ b/Charts/odin-jungfrau/values.yaml @@ -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 From 27e877571bc160ca3d9887acb1a891fbc54c805c Mon Sep 17 00:00:00 2001 From: James O'Hea Date: Fri, 15 Aug 2025 11:15:42 +0100 Subject: [PATCH 5/5] Add data source endpoint to odin-jungfrau values.yaml --- Charts/odin-jungfrau/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Charts/odin-jungfrau/values.yaml b/Charts/odin-jungfrau/values.yaml index 9158ee2..94e008b 100644 --- a/Charts/odin-jungfrau/values.yaml +++ b/Charts/odin-jungfrau/values.yaml @@ -36,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"