More updates

Move dev-shm allocation to fan
Fix eiger endpoints
Nicer endpoint formatting
Use fastcs-eiger with fastcs-odin

Author: GDYendell

Charts/odin-eiger/deployment/fp.json

@@ -122,10 +122,10 @@
         "data": {
           "indexes": true
         },
-	      "data2": {
+        "data2": {
           "indexes": true
         },
-	      "data3": {
+        "data3": {
           "indexes": true
         }
       }
@@ -138,11 +138,11 @@
           "dims": [{{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}],
           "chunks": [1, {{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}]
         },
-	      "data2": {
+      "data2": {
           "dims": [{{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}],
           "chunks": [1, {{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}]
         },
-	      "data3": {
+        "data3": {
           "dims": [{{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}],
           "chunks": [1, {{ .Values.sensorSizeY }}, {{ .Values.sensorSizeX }}]
         }
@@ -151,7 +151,7 @@
   },
   {
     "eiger": {
-      "endpoint": "{{ .Values.endpoint }}:{{ add 3160 .idx | add1 }}"
+      "endpoint": "{{ .Values.detectorName }}-eiger-fan:{{ add 31600 .idx | add1 }}"
     }
   }
 ]

Charts/odin-eiger/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/eiger_meta_writer \
     --writer eiger_detector.EigerMetaWriter \
     --sensor-shape {{ .Values.sensorSizeY }} {{ .Values.sensorSizeX }} \
-    --data-endpoints {{ include "odin-helm-charts.rangeJoin" (dict "separator" "," "format" $endpointFormat "count" .Values.odinDataCount ) }}
+    --data-endpoints {{ join "," $endpoints }}

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

@@ -7,13 +7,16 @@ adapters    = fp, mw, ef
 [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]
 module = odin_data.control.meta_listener_adapter.MetaListenerAdapter
 endpoints = {{ $.Values.detectorName }}-meta-writer:5659

Charts/odin-eiger/ioc-config/start.sh

@@ -4,4 +4,4 @@
 sleep 5
 
 # Start the IOC
-stdio-expose --ptty --stdin --ctrl-d 'fastcs-odin ioc {{ .Values.pvPrefix }} --ip {{ .Values.detectorName }}-odin-server --port 8888'
+stdio-expose --ptty --stdin --ctrl-d 'fastcs-eiger ioc {{ .Values.pvPrefix }} --ip {{ .Values.detectorIp }} --port 80 --odin-ip {{ .Values.detectorName }}-odin-server --odin-port 8888'

Charts/odin-eiger/templates/eiger-fan.yaml

@@ -32,6 +32,10 @@ spec:
           configMap:
             name: {{ $.Values.detectorName }}-odin-config
             defaultMode: 0755
+        - name: dev-shm
+          emptyDir:
+            medium: Memory
+            sizeLimit: {{ $.Values.devShmSize }}
       containers:
         - name: {{ .Values.detectorName }}-eiger-fan
           image: {{ .Values.image }}
@@ -42,6 +46,8 @@ spec:
           volumeMounts:
             - name: {{ $.Values.detectorName }}-odin-config-volume
               mountPath: /odin/deployment
+            - name: dev-shm
+              mountPath: /dev/shm
           {{- with $.Values.eigerFanResources }}
           resources:
             {{- toYaml . | nindent 12 }}

Charts/odin-eiger/templates/odin-data.yaml

@@ -33,10 +33,6 @@ spec:
           configMap:
             name: {{ $.Values.detectorName }}-odin-config
             defaultMode: 0755
-        - name: dev-shm
-          emptyDir:
-            medium: Memory
-            sizeLimit: {{ $.Values.devShmSize }}
         {{- with $.Values.dataVolume }}
         - name: {{ $.Values.detectorName }}-data
           hostPath:
@@ -54,8 +50,6 @@ spec:
           volumeMounts:
             - name: {{ $.Values.detectorName }}-odin-config-volume
               mountPath: /odin/deployment
-            - name: dev-shm
-              mountPath: /dev/shm
             {{- with $.Values.dataVolume }}
             - name: {{ $.Values.detectorName }}-data
               mountPath: {{ .hostPath }}