L2SS-1030: merge branch 'master' into L2SS-1030

5ce72ad7 · Stefano Di Frischia · d236c1cd · b4899b07 · 5ce72ad7 · 5ce72ad7
Commit 5ce72ad7 authored 2 years ago by Stefano Di Frischia
--- a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+++ b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
@@ -10,6 +10,7 @@ xst = DeviceProxy("STAT/XST/1")
 unb2 = DeviceProxy("STAT/UNB2/1")
 boot = DeviceProxy("STAT/Boot/1")
 tilebeam = DeviceProxy("STAT/TileBeam/1")
+pcon = DeviceProxy("STAT/PCON/1")
 psoc = DeviceProxy("STAT/PSOC/1")
 beamlet = DeviceProxy("STAT/Beamlet/1")
 digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
@@ -19,4 +20,4 @@ temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
 configuration = DeviceProxy("STAT/Configuration/1")

 # Put them in a list in case one wants to iterate
-devices = [apsct, ccd, apspu, recv, sdp, bst, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperaturemanager, docker, configuration]
+devices = [apsct, ccd, apspu, recv, sdp, bst, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperaturemanager, docker, pcon, psoc, configuration]
--- a/docker-compose/jupyterlab/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+++ b/docker-compose/jupyterlab/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
@@ -10,6 +10,7 @@ xst = DeviceProxy("STAT/XST/1")
 unb2 = DeviceProxy("STAT/UNB2/1")
 boot = DeviceProxy("STAT/Boot/1")
 tilebeam = DeviceProxy("STAT/TileBeam/1")
+pcon = DeviceProxy("STAT/PCON/1")
 psoc = DeviceProxy("STAT/PSOC/1")
 beamlet = DeviceProxy("STAT/Beamlet/1")
 digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
@@ -19,4 +20,4 @@ temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
 configuration = DeviceProxy("STAT/Configuration/1")

 # Put them in a list in case one wants to iterate
-devices = [apsct, ccd, apspu, recv, sdp, bst, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperaturemanager, docker, configuration]
+devices = [apsct, ccd, apspu, recv, sdp, bst, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperaturemanager, docker, pcon, psoc, configuration]
--- a/jupyter-notebooks/load_macro.ipynb
+++ b/jupyter-notebooks/load_macro.ipynb
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c0494f3f-9db5-44cf-b70b-66a4e4180e71",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# load the macro\n",
+    "%store -r __start_devices"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f54daaa7-848f-4a5d-b6c6-70630e3c9474",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "__start_devices"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "StationControl",
+   "language": "python",
+   "name": "stationcontrol"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.3"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+%% Cell type:code id:c0494f3f-9db5-44cf-b70b-66a4e4180e71 tags:
+
+``` python
+# load the macro
+%store -r __start_devices
+```
+
+%% Cell type:code id:f54daaa7-848f-4a5d-b6c6-70630e3c9474 tags:
+
+``` python
+__start_devices
+```
--- a/jupyter-notebooks/macros.ipynb
+++ b/jupyter-notebooks/macros.ipynb
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "69bb10e4-133e-40da-aa35-70da4b07d919",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Start all devices\n",
+    "for device in devices:\n",
+    "    try:\n",
+    "        if device.state() == DevState.FAULT:\n",
+    "            device.Off()\n",
+    "        if device.state() == DevState.OFF:\n",
+    "            device.warm_boot()\n",
+    "        if device.state() == DevState.INIT:\n",
+    "            device.Standby()\n",
+    "        if device.state() == DevState.STANDBY:\n",
+    "            device.On()  \n",
+    "        print(f'{device} is in state {device.state()}')\n",
+    "    except ConnectionFailed as e:\n",
+    "        print(f\"{device} is in state DOWN: {e.args[0].desc}\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6cad779f-6c9a-44a3-bbc8-9017cfb0f903",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# %macro -q <macro_name> <cell_number>\n",
+    "%macro -q __start_devices 1"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "fc8cc0eb-2dcd-4905-9fb6-7bdbaf5b4650",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "recv.off()\n",
+    "recv.state()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0905f4b9-918f-4207-99d9-c73900271493",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "__start_devices"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "846e6813-58c5-4f1d-a156-8e19c073b2bf",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "recv.state()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "4e3b628e-7283-4d8d-8fd9-188142c810d1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# store the macro\n",
+    "%store __start_devices  "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ea34b186-48f5-4220-9951-2b61df9efe97",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# load the macro\n",
+    "%store -r __start_devices"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "a7bc9113-dc8c-40b9-9d03-0f9cf275a9e5",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "__start_devices"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b3644931-84fb-44e8-871b-49c32c3f9ec6",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "StationControl",
+   "language": "python",
+   "name": "stationcontrol"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.3"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+%% Cell type:code id:69bb10e4-133e-40da-aa35-70da4b07d919 tags:
+
+``` python
+# Start all devices
+for device in devices:
+    try:
+        if device.state() == DevState.FAULT:
+            device.Off()
+        if device.state() == DevState.OFF:
+            device.warm_boot()
+        if device.state() == DevState.INIT:
+            device.Standby()
+        if device.state() == DevState.STANDBY:
+            device.On()
+        print(f'{device} is in state {device.state()}')
+    except ConnectionFailed as e:
+        print(f"{device} is in state DOWN: {e.args[0].desc}")
+```
+
+%% Cell type:code id:6cad779f-6c9a-44a3-bbc8-9017cfb0f903 tags:
+
+``` python
+# %macro -q <macro_name> <cell_number>
+%macro -q __start_devices 1
+```
+
+%% Cell type:code id:fc8cc0eb-2dcd-4905-9fb6-7bdbaf5b4650 tags:
+
+``` python
+recv.off()
+recv.state()
+```
+
+%% Cell type:code id:0905f4b9-918f-4207-99d9-c73900271493 tags:
+
+``` python
+__start_devices
+```
+
+%% Cell type:code id:846e6813-58c5-4f1d-a156-8e19c073b2bf tags:
+
+``` python
+recv.state()
+```
+
+%% Cell type:code id:4e3b628e-7283-4d8d-8fd9-188142c810d1 tags:
+
+``` python
+# store the macro
+%store __start_devices
+```
+
+%% Cell type:code id:ea34b186-48f5-4220-9951-2b61df9efe97 tags:
+
+``` python
+# load the macro
+%store -r __start_devices
+```
+
+%% Cell type:code id:a7bc9113-dc8c-40b9-9d03-0f9cf275a9e5 tags:
+
+``` python
+__start_devices
+```
+
+%% Cell type:code id:b3644931-84fb-44e8-871b-49c32c3f9ec6 tags:
+
+``` python
+```