Updating odin-jungfrau helm charts with defined ports, sensor sizes, etc

Author: JamesOHeaDLS

Charts/odin-jungfrau/config/start.sh

@@ -4,4 +4,4 @@
 sleep 5
 
 # Start the IOC
-fastcs-odin ioc {{ .Values.pvPrefix }} --ip {{ .Values.detectorName }}-odin-server --port 8888
+fastcs-jungfrau ioc {{ .Values.pvPrefix }} --config /epics/ioc/jungfrau_9m.config --odin-ip {{ .Values.detectorName }}-odin-server --odin-port 8888

Charts/odin-jungfrau/deployment/fp.json

@@ -126,15 +126,15 @@
     "hdf": {
       "dataset": {
         "data": {
-          "dims": [{{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}],
-          "chunks": [1, {{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}]
+          "dims": [512, 1024],
+          "chunks": [1, 512, 1024]
         }
       }
     }
   },
   {
     "jungfrau": {
-      "endpoint": "{{ .Values.endpoint }}:{{ add 8000 .idx }}"
+      "endpoint": "{{ .Values.endpoint }}:{{ add 31001 .idx }}"
     }
   }
 ]

Charts/odin-jungfrau/deployment/meta-writer.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
-{{- $endpointFormat := (printf "tcp://%s-odin-data-%%d:%d" .Values.detectorName 10008) }}
+{{- $endpoints := list }}
+{{- range $i := until (int .Values.odinDataCount) }}
+  {{- $endpoints = append $endpoints (printf "tcp://%s-odin-data-%d:10008" $.Values.detectorName $i) }}
+{{- end }}
 
 /venv/bin/jungfrau_meta_writer \
     --writer jungfrau_detector.JungfrauMetaWriter \
-    --sensor-shape {{ .Values.sensorSizeX }} {{ .Values.sensorSizeY }} \
-    --data-endpoints {{ include "odin-helm-charts.rangeJoin" (dict "separator" "," "format" $endpointFormat "count" .Values.odinDataCount ) }}
+    --sensor-shape 512 1024 \
+    --data-endpoints {{ join "," $endpoints }}

Charts/odin-jungfrau/deployment/odin-server.cfg

@@ -7,10 +7,14 @@ adapters    = fp, mw
 [tornado]
 logging = error
 
+{{- $endpoints := list }}
+{{- range $i := until (int .Values.odinDataCount) }}
+  {{- $endpoints = append $endpoints (printf "%s-odin-data-%d:10004" $.Values.detectorName $i) }}
+{{- end }}
+
 [adapter.fp]
 module = odin_data.control.frame_processor_adapter.FrameProcessorAdapter
-{{- $endpointFormat := (printf "%s-odin-data-%%d:%d" .Values.detectorName 10004) }}
-endpoints = {{ include "odin-helm-charts.rangeJoin" (dict "separator" ", " "format" $endpointFormat "count" .Values.odinDataCount ) }}
+endpoints = {{ join ", " $endpoints }}
 update_interval = 0.2
 
 [adapter.mw]