This commit is contained in:
@@ -14,7 +14,7 @@ run("Devices/Elements")
|
||||
###################################################################################################
|
||||
import ch.psi.pshell.data.LayoutSF as LayoutSF
|
||||
|
||||
LayoutSF.setExperimentArguments([charge, laser, rep_rate, destination_AR, energy_AR])
|
||||
LayoutSF.setExperimentArguments([charge, laser, rep_rate_bunch_1, rep_rate_bunch_2, destination_AR, energy_AR])
|
||||
|
||||
|
||||
|
||||
@@ -391,7 +391,7 @@ def setup_camera_scan():
|
||||
if not is_laser_on(1) and not is_laser_on(2):
|
||||
raise Exception("Both bunches are on delay")
|
||||
save_laser_state()
|
||||
multiple_background = multiple_background and use_background
|
||||
multiple_background = use_background and multiple_background
|
||||
if source == "server":
|
||||
if use_screen_panel_stream:
|
||||
cam_server.start(camera_name + "_sp1", True)
|
||||
@@ -499,17 +499,14 @@ def end_camera_scan():
|
||||
###################################################################################################
|
||||
|
||||
if get_context().isServerEnabled():
|
||||
import ch.psi.pshell.epics.CAS as CAS
|
||||
#CAS.setServerPort(5062)
|
||||
|
||||
class ServerUrl(RegisterBase):
|
||||
def doRead(self):
|
||||
return get_context().server.baseURL
|
||||
|
||||
d = ServerUrl()
|
||||
d.initialize()
|
||||
|
||||
cas5 = CAS("PSHELL_OP:SERVER_URL", d, 'string')
|
||||
add_device(EpicsServerUrl("epics_server_url_old", "PSHELL_OP:SERVER_URL"), True) #TODO: Change dependencies to "SF-PSHELL_OP:SERVER_URL and remove
|
||||
add_device(EpicsServerUrl("epics_server_url", "SF-PSHELL_OP:SERVER_URL"), True)
|
||||
add_device(EpicsServerState("epics_server_state", "SF-PSHELL_OP:STATE"), True)
|
||||
add_device(EpicsCmdAPI("epics_cmd", "SF-PSHELL_OP:CMD", as_string=False), True)
|
||||
add_device(EpicsCmdAPI("epics_cmd_bg", "SF-PSHELL_OP:CMD_BG", as_string=False, background=True), True)
|
||||
add_device(EpicsCmdAPI("epics_cmd_str", "SF-PSHELL_OP:CMD_STR", as_string=True), True)
|
||||
add_device(EpicsCmdAPI("epics_cmd_str_bg", "SF-PSHELL_OP:CMD_STR_BG", as_string=True, background=True), True)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user