Fixed bugs. The first was how the parser was being overwritten in VirtualAccelerator with the default parser. The second was with how the BTF VA was created. Now, initial setting changes are implemented before returning the BTF VA in build_btf.

Author: catheybl

virtaccl/site/BTF/btf_virtual_accelerator.py

@@ -35,6 +35,7 @@ def btf_arguments():
     loc = Path(__file__).parent
     va_parser = VA_Parser()
     va_parser.set_description('Run the BTF PyORBIT virtual accelerator server.')
+    va_parser.edit_argument('--sync_time', {'action': 'store_false'})
 
     va_parser = add_pyorbit_arguments(va_parser)
     # Set the defaults for the PyORBIT model.
@@ -308,6 +309,7 @@ def build_btf(**kwargs):
     server = EPICS_Server(process_delay=delay, print_pvs=kwargs['print_pvs'])
 
     btf_virac = VirtualAccelerator(model, beam_line, server, **kwargs)
+    btf_virac.track()
     return btf_virac
 
 

virtaccl/virtual_accelerator.py

@@ -117,8 +117,8 @@ def add_va_arguments(va_parser: VA_Parser) -> VA_Parser:
 
 class VirtualAccelerator:
     def __init__(self, model: Model, beam_line: BeamLine, server: Server, **kwargs):
-        kwargs = VA_Parser().initialize_arguments() | kwargs
-        print(kwargs)
+        if not kwargs:
+            kwargs = VA_Parser().initialize_arguments()
 
         self.debug = kwargs['debug']
         self.sync_time = kwargs['sync_time']
@@ -129,6 +129,7 @@ def __init__(self, model: Model, beam_line: BeamLine, server: Server, **kwargs):
         beam_line.update_readbacks()
         sever_parameters = beam_line.get_server_parameter_definitions()
         server.add_parameters(sever_parameters)
+        beam_line.reset_devices()
 
         self.model = model
         self.beam_line = beam_line
@@ -165,7 +166,6 @@ def track(self, timestamp: datetime = None):
         self.server.set_parameters(new_server_values, timestamp=timestamp)
 
     def start_server(self):
-        self.beam_line.reset_devices()
         self.server.start()
         print(f"Server started.")
         now = None