From 4e5c60fa474b6d514146bf3518465c686fa9e65b Mon Sep 17 00:00:00 2001
From: Erik von Reis <evonreis@caltech.edu>
Date: Mon, 30 Nov 2020 01:46:45 -0800
Subject: [PATCH] systemd generator: added cdsrfm processes
---
support/systemd/generator/cdsrfm.py | 12 ++++++++++++
support/systemd/generator/front_end.py | 2 +-
support/systemd/generator/sequencer.py | 8 ++++----
3 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 support/systemd/generator/cdsrfm.py
diff --git a/support/systemd/generator/cdsrfm.py b/support/systemd/generator/cdsrfm.py
new file mode 100644
index 000000000..0f973010b
--- /dev/null
+++ b/support/systemd/generator/cdsrfm.py
@@ -0,0 +1,12 @@
+from front_end import Process
+
+
+class CDSRFMProcesses(object):
+ def __init__(self, target_dir):
+ self.target_dir=target_dir
+
+ def epics(self):
+ return Process(True, "rts-cdsrfm-epics", "rts-cdsrfm-epics")
+
+ def module(self):
+ return Process(True, "rts-cdsrfm-module", "rts-cdsrfm-module")
\ No newline at end of file
diff --git a/support/systemd/generator/front_end.py b/support/systemd/generator/front_end.py
index d59cfd5b8..e8b2e1d45 100644
--- a/support/systemd/generator/front_end.py
+++ b/support/systemd/generator/front_end.py
@@ -99,7 +99,7 @@ Address={options['DAQ_ETH_IP']}
""")
# setup services
- services = ["rts-local_dc.service", f"rts-tranpsport@{options[ts]}.service"]
+ services = ["rts-local_dc.service", f"rts-transport@{options[ts]}.service"]
self.serialize_units(services)
# setup target
diff --git a/support/systemd/generator/sequencer.py b/support/systemd/generator/sequencer.py
index 05612b3fa..fba228022 100644
--- a/support/systemd/generator/sequencer.py
+++ b/support/systemd/generator/sequencer.py
@@ -49,10 +49,10 @@ class Sequencer(object):
@staticmethod
def create_cdsrfm_start_sequence(front_end_processes, cdsrfm_processes):
sequence = [
- front_end_processes.DolphinPort(),
- front_end_processes.DolphinDrivers(),
- cdsrfm_processes.CDSRFMEpics(),
- cdsrfm_processes.CDSRFMModule()]
+ front_end_processes.dolphin_port(),
+ front_end_processes.dolphin_drivers(),
+ cdsrfm_processes.epics(),
+ cdsrfm_processes.module()]
return sequence
def link_sequence(self, sequence):
--
GitLab