From 1aa631901b86ae6dd0d22d4fe5e66f0a5ddc7f20 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Wed, 17 Mar 2021 10:49:36 +0100
Subject: [PATCH] removed CAMS142-M1 as it now comes from camserver

---
 Config Tests.ipynb                      | 36 ++++++++++++-------------
 Readme.md                               |  2 +-
 operation-tools/restart_imagebuffer.yml | 10 +++++++
 sources/image.sources                   |  2 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Config Tests.ipynb b/Config Tests.ipynb
index dc4a3eb..ba7602f 100644
--- a/Config Tests.ipynb	
+++ b/Config Tests.ipynb	
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 2,
    "metadata": {
     "hide_input": false
    },
@@ -985,22 +985,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 6,
    "metadata": {
     "scrolled": true
    },
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<Response [200]>"
-      ]
-     },
-     "execution_count": 11,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Rebuild cache of data-api\n",
     "response = requests.post(\"https://data-api.psi.ch/sf/channels/config\", json={\"reload\": \"true\"})"
@@ -1008,7 +997,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "channels = response.json()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -11403,7 +11401,7 @@
        "   {'source': 'tcp://daqsf-sioc-cs-61.psi.ch:9010',\n",
        "    'backend': 'sf-imagebuffer',\n",
        "    'type': 'uint16',\n",
-       "    'shape': [1280, 1024],\n",
+       "    'shape': [2560, 2160],\n",
        "    'name': 'SARBD01-DSCR050:FPICTURE'},\n",
        "   {'source': 'tcp://daqsf-sioc-cs-62.psi.ch:9010',\n",
        "    'backend': 'sf-imagebuffer',\n",
@@ -11443,7 +11441,7 @@
        "   {'source': 'tcp://daqsf-sioc-cs-81.psi.ch:9010',\n",
        "    'backend': 'sf-imagebuffer',\n",
        "    'type': 'uint16',\n",
-       "    'shape': [1280, 1024],\n",
+       "    'shape': [659, 494],\n",
        "    'name': 'SARES11-XPR125-C4P2:FPICTURE'},\n",
        "   {'source': 'tcp://daqsf-daqsync-05.psi.ch:9002',\n",
        "    'backend': 'sf-imagebuffer',\n",
@@ -11902,13 +11900,13 @@
        "    'name': 'SLG-LCAM-C104:FPICTURE'}]}]"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 8,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "response.json()"
+    "channels"
    ]
   },
   {
diff --git a/Readme.md b/Readme.md
index 28c87fa..1949a09 100644
--- a/Readme.md
+++ b/Readme.md
@@ -38,7 +38,7 @@ More details on the gitutils command can be found at: https://gitutils.readthedo
 
 # Administration
 
-If there are new changes to this configuration (either through a merge request or direct commit) the configuration needs to be uploaded to the Data/ImageBuffer. To do so clone or pull the latest changes from this repository and execute the `./upload.sh` script that comes with this repository. 
+If there are new changes to this configuration (either through a merge request or direct commit) the configuration needs to be uploaded to the Data/ImageBuffer. To do so clone or pull the latest changes from this repository and execute the `./bufferutils upload` script that comes with this repository (you have to be on a machine that have /opt/gfa/python available!). 
 
 
 # Configuration Management
diff --git a/operation-tools/restart_imagebuffer.yml b/operation-tools/restart_imagebuffer.yml
index b20d553..359de40 100644
--- a/operation-tools/restart_imagebuffer.yml
+++ b/operation-tools/restart_imagebuffer.yml
@@ -48,3 +48,13 @@
       systemd:
         state: started
         name: daq-query-node
+
+
+- name: restart data api
+  hosts: data_api
+  become: true
+  tasks:
+    - name: start data-api
+      systemd:
+        state: restarted
+        name: data-api
\ No newline at end of file
diff --git a/sources/image.sources b/sources/image.sources
index c6df788..dc3c181 100644
--- a/sources/image.sources
+++ b/sources/image.sources
@@ -93,7 +93,7 @@
 		
 		/* Aramis ESB-Bernina */
 	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:8060","split":4,"backend":"sf-imagebuffer"}
-	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
+/*	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} */
 	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
 	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9020","split":4,"backend":"sf-imagebuffer"}
 /*	    ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9030","split":4,"backend":"sf-imagebuffer"} */