From d8dfb591ce8b3d3cbbf76c633b130aca736bd071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20BRON=C3=88S?= <romain.brones@synchrotron-soleil.fr>
Date: Mon, 17 Jun 2024 15:02:35 +0200
Subject: [PATCH] Add sync option to command line
---
FofbTool/Operation.py | 2 --
scripts/FofbTool | 7 ++++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/FofbTool/Operation.py b/FofbTool/Operation.py
index 2d2dfda..95b3f14 100644
--- a/FofbTool/Operation.py
+++ b/FofbTool/Operation.py
@@ -515,8 +515,6 @@ def sync_all_bpm():
lbpevrx = tango.Group('lbpevrx')
lbpevrx.add(FofbTool.Configuration.config["tangopath"]["lbpevrx"].split())
- tcentral = tango.DeviceProxy(FofbTool.Configuration.config["tangopath"]["timing-central"])
-
# ---------------------------------------------------------------------------------------------------------------
# Step 1 : Init BPMs
logger.info("Configure Libera Electron with FofbManager")
diff --git a/scripts/FofbTool b/scripts/FofbTool
index a5f5cef..6cb9171 100755
--- a/scripts/FofbTool
+++ b/scripts/FofbTool
@@ -16,6 +16,7 @@ if __name__ == '__main__':
# Safer import: add the parent dir in path
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
import FofbTool.Utils
+ import FofbTool.Operation
import FofbTool.Configuration # Still needs for one function, TODO
@@ -74,6 +75,8 @@ if __name__ == '__main__':
parser.add_argument("--start-ccn", action="store_true",
help="Start command for the ComBPM applications blocks.")
+ parser.add_argument("--sync", action="store_true",
+ help="Start synchronization sequence for Libera Electron and Libera Brillance Plus.")
args = parser.parse_args()
@@ -123,6 +126,9 @@ if __name__ == '__main__':
if args.configure in ("corr", "all"):
FofbTool.Configuration.centralnode_configure_corr()
+ if args.sync:
+ FofbTool.Operation.sync_all_bpm()
+
if args.start or args.start_comlbp:
FofbTool.Utils.start_all_comlbp()
if args.start or args.start_combpm:
@@ -132,4 +138,3 @@ if __name__ == '__main__':
if not args.align_fa is None:
FofbTool.Utils.align_all_ccn(args.align_fa, force=args.force)
-
--
GitLab