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 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 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 }} + } } ] diff --git a/Charts/odin-jungfrau/values.yaml b/Charts/odin-jungfrau/values.yaml index 1c00a15..94e008b 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 @@ -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"