update to JF server sf-daq-4

This commit is contained in:
Chris Milne
2018-06-27 17:06:15 +02:00
parent 31e5b329a0
commit c52f9c907c
3 changed files with 7 additions and 2 deletions
+5
View File
@@ -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,
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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:])