From b341b0a77e0489dc2f5c23e715840a6ba8c3a16c Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 7 Nov 2022 17:27:08 -0500 Subject: [PATCH 1/3] MNT: do not use too-new caproto feature --- iocs/switchboard.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iocs/switchboard.py b/iocs/switchboard.py index 4f653a9..49d4245 100644 --- a/iocs/switchboard.py +++ b/iocs/switchboard.py @@ -2,7 +2,6 @@ from textwrap import dedent from caproto.server import PVGroup, ioc_arg_parser, pvproperty, run -from caproto.server import PvpropertyInteger as Integer class PDFMMMSwitchBoard(PVGroup): @@ -21,7 +20,7 @@ class PDFMMMSwitchBoard(PVGroup): publish_to_queue = pvproperty( value=1, - dtype=Integer, + dtype=int, name="Pub-CMD", doc="""A flag to be used to tell the adjudicator to do it's job. From 0f1af43bc55511e396af89427885a451f664fb14 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 7 Nov 2022 18:17:25 -0500 Subject: [PATCH 2/3] ENH: move IOC into package and add service file --- mmm_experiments/iocs/__init__.py | 1 + {iocs => mmm_experiments/iocs}/switchboard.py | 0 mmm_experiments/switchboard-ioc.service | 12 ++++++++++++ 3 files changed, 13 insertions(+) create mode 100644 mmm_experiments/iocs/__init__.py rename {iocs => mmm_experiments/iocs}/switchboard.py (100%) create mode 100644 mmm_experiments/switchboard-ioc.service diff --git a/mmm_experiments/iocs/__init__.py b/mmm_experiments/iocs/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/mmm_experiments/iocs/__init__.py @@ -0,0 +1 @@ + diff --git a/iocs/switchboard.py b/mmm_experiments/iocs/switchboard.py similarity index 100% rename from iocs/switchboard.py rename to mmm_experiments/iocs/switchboard.py diff --git a/mmm_experiments/switchboard-ioc.service b/mmm_experiments/switchboard-ioc.service new file mode 100644 index 0000000..79070f5 --- /dev/null +++ b/mmm_experiments/switchboard-ioc.service @@ -0,0 +1,12 @@ +[Unit] +Description=0MQ bridge being used for MMM experiments + +[Service] +User=xf28id1 +Group=xf28id1 +Environment="PATH=/home/xf28id1/project-mmm/mmm-experiments/venv/bin/:$PATH EPICS_CAS_AUTO_BEACON_ADDR_LIST=no EPICS_CAS_BEACON_ADDR_LIST=10.66.219.255" +ExecStart=/home/xf28id1/project-mmm/mmm-experiments/venv/bin/python3 -m mmm_experiments.ioc.switchboard --xf 'XF:28ID1-DA' --list-pvs --interface=10.66.219.41 -vv +Restart=always + +[Install] +WantedBy=multi-user.target From 70635306b82c5ed6b6aef35df643cc479526d09c Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 7 Nov 2022 20:39:12 -0500 Subject: [PATCH 3/3] FIX: turn down spam + do not break the network binding --- mmm_experiments/switchboard-ioc.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmm_experiments/switchboard-ioc.service b/mmm_experiments/switchboard-ioc.service index 79070f5..ef3d949 100644 --- a/mmm_experiments/switchboard-ioc.service +++ b/mmm_experiments/switchboard-ioc.service @@ -5,7 +5,7 @@ Description=0MQ bridge being used for MMM experiments User=xf28id1 Group=xf28id1 Environment="PATH=/home/xf28id1/project-mmm/mmm-experiments/venv/bin/:$PATH EPICS_CAS_AUTO_BEACON_ADDR_LIST=no EPICS_CAS_BEACON_ADDR_LIST=10.66.219.255" -ExecStart=/home/xf28id1/project-mmm/mmm-experiments/venv/bin/python3 -m mmm_experiments.ioc.switchboard --xf 'XF:28ID1-DA' --list-pvs --interface=10.66.219.41 -vv +ExecStart=/home/xf28id1/project-mmm/mmm-experiments/venv/bin/python3 -m mmm_experiments.ioc.switchboard --xf 'XF:28ID1-DA' --list-pvs -v Restart=always [Install]