From 5bf5e4fce4eb68f3f9c79ba5e08e55862e1dc3ed Mon Sep 17 00:00:00 2001 From: 4wc Date: Sun, 24 Nov 2024 10:21:33 -0500 Subject: [PATCH 1/2] Removed unused keyword uses from build_sns and VirtualAccelerator. --- virtaccl/site/SNS_Linac/virtual_SNS_linac.py | 1 - virtaccl/virtual_accelerator.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/virtaccl/site/SNS_Linac/virtual_SNS_linac.py b/virtaccl/site/SNS_Linac/virtual_SNS_linac.py index e85860a..5511e07 100644 --- a/virtaccl/site/SNS_Linac/virtual_SNS_linac.py +++ b/virtaccl/site/SNS_Linac/virtual_SNS_linac.py @@ -54,7 +54,6 @@ def build_sns(**kwargs): debug = kwargs['debug'] save_bunch = kwargs['save_bunch'] - physics_nodes = kwargs['physics_nodes'] config_file = Path(kwargs['config_file']) with open(config_file, "r") as json_file: diff --git a/virtaccl/virtual_accelerator.py b/virtaccl/virtual_accelerator.py index c981377..c616019 100644 --- a/virtaccl/virtual_accelerator.py +++ b/virtaccl/virtual_accelerator.py @@ -163,7 +163,6 @@ def __init__(self, model: ModelType, beam_line: BeamLine, server: ServerType, ** print(key) sys.exit() - self.debug = kwargs['debug'] self.sync_time = kwargs['sync_time'] self.update_period = 1 / kwargs['refresh_rate'] @@ -175,7 +174,7 @@ def __init__(self, model: ModelType, beam_line: BeamLine, server: ServerType, ** server.add_parameters(sever_parameters) beam_line.reset_devices() - if self.debug: + if kwargs['debug']: print(server) self.track() From 0fe448da5a319027355d8b0c7b8b66c95afd322a Mon Sep 17 00:00:00 2001 From: 4wc Date: Mon, 9 Dec 2024 14:32:23 -0500 Subject: [PATCH 2/2] Fix corrector polarities to match injection wizard. --- virtaccl/site/SNS_IDmp/va_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtaccl/site/SNS_IDmp/va_config.json b/virtaccl/site/SNS_IDmp/va_config.json index 8ca3081..ebfeb50 100644 --- a/virtaccl/site/SNS_IDmp/va_config.json +++ b/virtaccl/site/SNS_IDmp/va_config.json @@ -15,7 +15,7 @@ "IDmp_Mag:DCH01": { "PyORBIT_Name": "HCorrector1", "Power_Supply": "IDmp_Mag:PS_DCH01", - "Polarity": 1 + "Polarity": -1 }, "IDmp_Mag:DCV01": { "PyORBIT_Name": "VCorrector1", @@ -25,7 +25,7 @@ "IDmp_Mag:DCH02": { "PyORBIT_Name": "HCorrector2", "Power_Supply": "IDmp_Mag:PS_DCH02", - "Polarity": 1 + "Polarity": -1 }, "IDmp_Mag:DCV02": { "PyORBIT_Name": "VCorrector2",