diff --git a/aliases/alvra.py b/aliases/alvra.py index 31de233..0b91090 100755 --- a/aliases/alvra.py +++ b/aliases/alvra.py @@ -225,6 +225,11 @@ aliases = { # 'z_und' : 119, # 'desc' : 'PALM EO-sampling delay line', # 'eco_type' : 'xdiagnostics.palm.eo'}, + 'http://sf-daq-4:10000' : { + 'alias' : 'DetJF', + 'z_und' : 125, + 'desc' : '4.5M Jungfrau detector', + 'eco_type' : 'devices_general.alvradetectors.DIAClient'}, # 'http://sf-daq-2:10000' : { # 'alias' : 'DetJF', # 'z_und' : 127, diff --git a/devices_general/alvradetectors.py b/devices_general/alvradetectors.py index 030b780..80318d4 100755 --- a/devices_general/alvradetectors.py +++ b/devices_general/alvradetectors.py @@ -460,7 +460,7 @@ class DiodeDigitizer: # self.check_still_running() class DIAClient: - def __init__(self, Id, instrument=None, api_address = "http://sf-daq-2:10000", jf_name="JF_4.5M"): + def __init__(self, Id, instrument=None, api_address = "http://sf-daq-4:10000", jf_name="JF_4.5M"): self.Id = Id self._api_address = api_address self.client = DetectorIntegrationClient(api_address) diff --git a/instruments/alvra.py b/instruments/alvra.py index 772a0e1..1b372a6 100755 --- a/instruments/alvra.py +++ b/instruments/alvra.py @@ -137,7 +137,7 @@ channellistPhotonDiag = dict(alvra_channel_list= bsdaqPhotonDiag = BStools(default_channel_list=channellistPhotonDiag,default_file_path='%s') from eco.devices_general.alvradetectors import DIAClient -bsdaqJF = DIAClient('bsdaqJF', instrument="alvra", api_address = "http://sf-daq-2:10000") +bsdaqJF = DIAClient('bsdaqJF', instrument="alvra", api_address = "http://sf-daq-4:10000") try: bsdaqJF.pgroup = int(exp_config['pgroup'][1:])