From 6752997048ac6ab545422d643933a24542c2cc20 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 11 Apr 2022 15:43:20 +0200 Subject: [PATCH] replace 'iodev' by 'io' in cfg files --- cfg/addons/ah2700sea.cfg | 4 +-- cfg/addons/focus-be-filter.cfg | 2 +- cfg/ls240.cfg | 4 +-- cfg/ls370res.cfg | 4 +-- cfg/ls370test.cfg | 2 +- cfg/main/ccr2.cfg | 4 +-- cfg/main/ccr2ht.cfg | 6 ++-- cfg/main/fftf.cfg | 10 +++--- cfg/main/ill5.cfg | 18 +++++----- cfg/main/ma11.cfg | 30 ++++++++-------- cfg/main/ma6.cfg | 55 +++++++++++++++++++++++++++++ cfg/main/ma7.cfg | 24 ++++++------- cfg/main/ori4.cfg | 20 +++++------ cfg/main/smamor.cfg | 6 ++-- cfg/mb11.cfg | 22 ++++++------ cfg/ppms2.cfg | 34 +++++++++--------- cfg/ppms_proxy_test.cfg | 2 +- cfg/ppmssim.cfg | 34 +++++++++--------- cfg/ppmswin.cfg | 34 +++++++++--------- cfg/prep2.cfg | 4 +-- cfg/prep5.cfg | 36 +++++++++---------- cfg/prep6.cfg | 18 +++++----- cfg/sea/ccr2ht.cfg | 6 ++-- cfg/sea/focus-be-filter.cfg | 4 +-- cfg/sea/ma11_dil4_ultrasound_sr.cfg | 36 +++++++++---------- cfg/sea/ori1.cfg | 4 +-- cfg/sea/test_secop4.cfg | 2 +- cfg/sea/varioxB_vb.cfg | 18 +++++----- cfg/stick/ill5stick.cfg | 2 +- cfg/stick/ma11stick.cfg | 2 +- cfg/stick/ma7stick.cfg | 2 +- cfg/stick/ori4stick.cfg | 2 +- cfg/stick/sch5.cfg | 4 +-- cfg/test_ppms_mf.cfg | 20 +++++------ cfg/trinamic.cfg | 4 +-- cfg/uniax.cfg | 4 +-- cfg/varioxb.cfg | 16 ++++----- 37 files changed, 277 insertions(+), 222 deletions(-) create mode 100644 cfg/main/ma6.cfg diff --git a/cfg/addons/ah2700sea.cfg b/cfg/addons/ah2700sea.cfg index 2d2545f..89f4815 100644 --- a/cfg/addons/ah2700sea.cfg +++ b/cfg/addons/ah2700sea.cfg @@ -11,10 +11,10 @@ service = addons [cap] class = secop_psi.sea.SeaReadable -iodev = sea_addons +io = sea_addons sea_object = cap [capslope] class = secop_psi.sea.SeaReadable -iodev = sea_addons +io = sea_addons sea_object = capslope diff --git a/cfg/addons/focus-be-filter.cfg b/cfg/addons/focus-be-filter.cfg index 0815f77..2bdbadd 100644 --- a/cfg/addons/focus-be-filter.cfg +++ b/cfg/addons/focus-be-filter.cfg @@ -10,5 +10,5 @@ service = addons [befilter] class = secop_psi.sea.SeaReadable -iodev = sea_addons +io = sea_addons sea_object = cryo diff --git a/cfg/ls240.cfg b/cfg/ls240.cfg index c61fb85..199691f 100644 --- a/cfg/ls240.cfg +++ b/cfg/ls240.cfg @@ -8,9 +8,9 @@ uri = tcp://5000 [T] description = temperature on uniax stick class = secop_psi.ls240.Ls240 -iodev = T_iodev +io = T_io -[T_iodev] +[T_io] class = secop.bytesio.BytesIO description = IO device for LS240 uri = serial:///dev/ttyUSB0?baudrate=9600+parity=EVEN diff --git a/cfg/ls370res.cfg b/cfg/ls370res.cfg index 8f412f5..c27b644 100644 --- a/cfg/ls370res.cfg +++ b/cfg/ls370res.cfg @@ -5,7 +5,7 @@ description = Lsc370 Test [INTERFACE] uri = tcp://5000 -[lsmain_iodev] +[lsmain_io] description = the communication device class = secop_psi.ls370res.StringIO uri = lollypop-ts:3001 @@ -22,4 +22,4 @@ channel = 5 description = resistivity main = lsmain # the auto created iodev from lsmain: -iodev = lsmain_iodev +io = lsmain_io diff --git a/cfg/ls370test.cfg b/cfg/ls370test.cfg index 6ade7f7..4bbd375 100644 --- a/cfg/ls370test.cfg +++ b/cfg/ls370test.cfg @@ -18,4 +18,4 @@ channel = 3 description = resistivity main = lsmain # the auto created iodev from lsmain: -iodev = lsmain_iodev +io = lsmain_io diff --git a/cfg/main/ccr2.cfg b/cfg/main/ccr2.cfg index 8c0a90c..07f274a 100644 --- a/cfg/main/ccr2.cfg +++ b/cfg/main/ccr2.cfg @@ -10,11 +10,11 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt #[tscreen] #class = secop_psi.sea.SeaReadable -#iodev = sea_main +#io = sea_main #sea_object = tt #rel_paths = te diff --git a/cfg/main/ccr2ht.cfg b/cfg/main/ccr2ht.cfg index 1b76887..03891d0 100644 --- a/cfg/main/ccr2ht.cfg +++ b/cfg/main/ccr2ht.cfg @@ -10,18 +10,18 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt #[tscreen] #class = secop_psi.sea.SeaReadable -#iodev = sea_main +#io = sea_main #sea_object = tt #rel_paths = te [tcoldfinger] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = tt rel_paths = tk diff --git a/cfg/main/fftf.cfg b/cfg/main/fftf.cfg index b9c2b74..75a511d 100644 --- a/cfg/main/fftf.cfg +++ b/cfg/main/fftf.cfg @@ -10,27 +10,27 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt [p] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = p extra_modules = vacuumpump gasflow tlimit tlimit_without_vacuum [gasflow] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main single_module = p.gasflow [vacuumpump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = p rel_paths = vacuumpump tlimit tlimit_without_vacuum [table] class = secop_psi.sea.SeaModule -iodev = sea_main +io = sea_main sea_object = table diff --git a/cfg/main/ill5.cfg b/cfg/main/ill5.cfg index bd5e378..badc85f 100644 --- a/cfg/main/ill5.cfg +++ b/cfg/main/ill5.cfg @@ -10,46 +10,46 @@ service = main [t] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt [tm] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt rel_paths = tm [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc [nv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = nv [ln2fill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ln2fill [hefill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hefill [hepump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hepump [hemot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = hemot [table] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = table diff --git a/cfg/main/ma11.cfg b/cfg/main/ma11.cfg index 86527f8..ab7cfd6 100644 --- a/cfg/main/ma11.cfg +++ b/cfg/main/ma11.cfg @@ -10,76 +10,76 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt rel_paths = . tm [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc [nv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = nv [hepump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hepump [hemot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = hemot [ln2fill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ln2fill [hefill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hefill [lev] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = lev [mf] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = mf [tcoil] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = tcoil [table] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = table [ccu2] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ccu2 [lnv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = lnv [lpr] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = lpr [lambdawatch] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = lambdawatch diff --git a/cfg/main/ma6.cfg b/cfg/main/ma6.cfg new file mode 100644 index 0000000..68c24b3 --- /dev/null +++ b/cfg/main/ma6.cfg @@ -0,0 +1,55 @@ +[NODE] +description = compact 6 Tesla vertical cryomagnet +id = ma6.config.sea.psi.ch + +[sea_main] +class = secop_psi.sea.SeaClient +description = main sea connection for ma6.config +config = ma6.config +service = main + +[tt] +class = secop_psi.sea.SeaDrivable +io = sea_main +sea_object = tt +rel_paths = . tm + +[cc] +class = secop_psi.sea.SeaReadable +io = sea_main +sea_object = cc + +[nv] +class = secop_psi.sea.SeaWritable +io = sea_main +sea_object = nv + +[hepump] +class = secop_psi.sea.SeaWritable +io = sea_main +sea_object = hepump + +[hemot] +class = secop_psi.sea.SeaDrivable +io = sea_main +sea_object = hemot + +[ln2fill] +class = secop_psi.sea.SeaWritable +io = sea_main +sea_object = ln2fill + +[hefill] +class = secop_psi.sea.SeaWritable +io = sea_main +sea_object = hefill + +[mf] +class = secop_psi.sea.SeaReadable +io = sea_main +sea_object = mf + +[lev] +class = secop_psi.sea.SeaReadable +io = sea_main +sea_object = lev diff --git a/cfg/main/ma7.cfg b/cfg/main/ma7.cfg index 0160dd7..b9e54b0 100644 --- a/cfg/main/ma7.cfg +++ b/cfg/main/ma7.cfg @@ -10,64 +10,64 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt rel_paths = . tm [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc [nv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = nv [hefill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hefill [hepump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hepump [hemot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = hemot [ln2fill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ln2fill [mf] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = mf [lev] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = lev [tcoil1] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = tcoil rel_paths = ta [tcoil2] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = tcoil rel_paths = tb [table] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = table diff --git a/cfg/main/ori4.cfg b/cfg/main/ori4.cfg index 40f1101..5145d10 100644 --- a/cfg/main/ori4.cfg +++ b/cfg/main/ori4.cfg @@ -10,51 +10,51 @@ service = main [t] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt [tm] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt rel_paths = tm [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc [nv] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = nv [nvmot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = nvmot [ln2fill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = ln2fill [hefill] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hefill [hepump] class = secop_psi.sea.SeaWritable -iodev = sea_main +io = sea_main sea_object = hepump [hemot] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = hemot [table] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = table diff --git a/cfg/main/smamor.cfg b/cfg/main/smamor.cfg index 781410a..c7e708b 100644 --- a/cfg/main/smamor.cfg +++ b/cfg/main/smamor.cfg @@ -10,15 +10,15 @@ service = main [smi] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = smi [smv] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = smv [r] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = r diff --git a/cfg/mb11.cfg b/cfg/mb11.cfg index 41a1c25..7de74e9 100644 --- a/cfg/mb11.cfg +++ b/cfg/mb11.cfg @@ -5,66 +5,66 @@ description = a SEA connection [ts] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ts.mb11.config remote_paths = . [tvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvs.mb11.config remote_paths = . [tvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvd.mb11.config remote_paths = . [pstat] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pstat.mb11.config remote_paths = . [pdyn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pdyn.mb11.config remote_paths = . [tneck1] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck1.mb11.config remote_paths = . [tneck2] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck2.mb11.config remote_paths = . [tnvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvs.mb11.config remote_paths = . [tnvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvd.mb11.config remote_paths = . [mf] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = mf.mb11.config remote_paths = . [tcoil] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tcoil.mb11.config remote_paths = . diff --git a/cfg/ppms2.cfg b/cfg/ppms2.cfg index 98bf491..e93f6d7 100644 --- a/cfg/ppms2.cfg +++ b/cfg/ppms2.cfg @@ -8,113 +8,113 @@ uri = 5000 [tt] class = secop_psi.ppms.Temp description = main temperature -iodev = ppms +io = ppms [mf] class = secop_psi.ppms.Field target.min = -9 target.max = 9 .description = magnetic field -.iodev = ppms +.io = ppms [pos] class = secop_psi.ppms.Position .description = sample rotator -.iodev = ppms +.io = ppms [lev] class = secop_psi.ppms.Level .description = helium level -.iodev = ppms +.io = ppms [chamber] class = secop_psi.ppms.Chamber .description = chamber state -.iodev = ppms +.io = ppms [r1] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 1 .no = 1 value.unit = Ohm -.iodev = ppms +.io = ppms [r2] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 2 .no = 2 value.unit = Ohm -.iodev = ppms +.io = ppms [r3] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 3 .no = 3 value.unit = Ohm -.iodev = ppms +.io = ppms [r4] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 4 .no = 4 value.unit = Ohm -.iodev = ppms +.io = ppms [i1] class = secop_psi.ppms.Channel .description = current channel 1 .no = 1 value.unit = uA -.iodev = ppms +.io = ppms [i2] class = secop_psi.ppms.Channel .description = current channel 2 .no = 2 value.unit = uA -.iodev = ppms +.io = ppms [i3] class = secop_psi.ppms.Channel .description = current channel 3 .no = 3 value.unit = uA -.iodev = ppms +.io = ppms [i4] class = secop_psi.ppms.Channel .description = current channel 4 .no = 4 value.unit = uA -.iodev = ppms +.io = ppms [v1] class = secop_psi.ppms.DriverChannel .description = voltage channel 1 .no = 1 value.unit = V -.iodev = ppms +.io = ppms [v2] class = secop_psi.ppms.DriverChannel .description = voltage channel 2 .no = 2 value.unit = V -.iodev = ppms +.io = ppms [tv] class = secop_psi.ppms.UserChannel .description = VTI temperature enabled = 1 value.unit = K -.iodev = ppms +.io = ppms [ts] class = secop_psi.ppms.UserChannel .description = sample temperature enabled = 1 value.unit = K -.iodev = ppms +.io = ppms [ppms] class = secop_psi.ppms.Main diff --git a/cfg/ppms_proxy_test.cfg b/cfg/ppms_proxy_test.cfg index bbaeea0..014e8a8 100644 --- a/cfg/ppms_proxy_test.cfg +++ b/cfg/ppms_proxy_test.cfg @@ -15,7 +15,7 @@ uri = tcp://localhost:5000 class = secop.Proxy remote_class = secop_psi.ppms.Field description = magnetic field -iodev = secnode +io = secnode value.min = -0.1 value.max = 0.1 target.min = -8 diff --git a/cfg/ppmssim.cfg b/cfg/ppmssim.cfg index 8f8a927..1bc9f6b 100644 --- a/cfg/ppmssim.cfg +++ b/cfg/ppmssim.cfg @@ -8,113 +8,113 @@ uri = tcp://5000 [tt] class = secop_psi.ppms.Temp description = main temperature -iodev = ppms +io = ppms [mf] class = secop_psi.ppms.Field target.min = -9 target.max = 9 .description = magnetic field -.iodev = ppms +.io = ppms [pos] class = secop_psi.ppms.Position .description = sample rotator -.iodev = ppms +.io = ppms [lev] class = secop_psi.ppms.Level .description = helium level -.iodev = ppms +.io = ppms [chamber] class = secop_psi.ppms.Chamber .description = chamber state -.iodev = ppms +.io = ppms [r1] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 1 .no = 1 value.unit = Ohm -.iodev = ppms +.io = ppms [r2] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 2 .no = 2 value.unit = Ohm -.iodev = ppms +.io = ppms [r3] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 3 .no = 3 value.unit = Ohm -.iodev = ppms +.io = ppms [r4] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 4 .no = 4 value.unit = Ohm -.iodev = ppms +.io = ppms [i1] class = secop_psi.ppms.Channel .description = current channel 1 .no = 1 value.unit = uA -.iodev = ppms +.io = ppms [i2] class = secop_psi.ppms.Channel .description = current channel 2 .no = 2 value.unit = uA -.iodev = ppms +.io = ppms [i3] class = secop_psi.ppms.Channel .description = current channel 3 .no = 3 value.unit = uA -.iodev = ppms +.io = ppms [i4] class = secop_psi.ppms.Channel .description = current channel 4 .no = 4 value.unit = uA -.iodev = ppms +.io = ppms [v1] class = secop_psi.ppms.DriverChannel .description = voltage channel 1 .no = 1 value.unit = V -.iodev = ppms +.io = ppms [v2] class = secop_psi.ppms.DriverChannel .description = voltage channel 2 .no = 2 value.unit = V -.iodev = ppms +.io = ppms [tv] class = secop_psi.ppms.UserChannel .description = VTI temperature enabled = 1 value.unit = K -.iodev = ppms +.io = ppms [ts] class = secop_psi.ppms.UserChannel .description = sample temperature enabled = 1 value.unit = K -.iodev = ppms +.io = ppms [ppms] class = secop_psi.ppms.Main diff --git a/cfg/ppmswin.cfg b/cfg/ppmswin.cfg index 6825890..491315b 100644 --- a/cfg/ppmswin.cfg +++ b/cfg/ppmswin.cfg @@ -8,99 +8,99 @@ uri = tcp://5000 [tt] class = secop_psi.ppms.Temp description = main temperature -iodev = ppms +io = ppms [mf] class = secop_psi.ppms.Field target.min = -9 target.max = 9 .description = magnetic field -.iodev = ppms +.io = ppms [pos] class = secop_psi.ppms.Position .description = sample rotator -.iodev = ppms +.io = ppms [lev] class = secop_psi.ppms.Level .description = helium level -.iodev = ppms +.io = ppms [chamber] class = secop_psi.ppms.Chamber .description = chamber state -.iodev = ppms +.io = ppms [r1] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 1 .no = 1 value.unit = Ohm -.iodev = ppms +.io = ppms [r2] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 2 .no = 2 value.unit = Ohm -.iodev = ppms +.io = ppms [r3] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 3 .no = 3 value.unit = Ohm -.iodev = ppms +.io = ppms [r4] class = secop_psi.ppms.BridgeChannel .description = resistivity channel 4 .no = 4 value.unit = Ohm -.iodev = ppms +.io = ppms [i1] class = secop_psi.ppms.Channel .description = current channel 1 .no = 1 value.unit = uA -.iodev = ppms +.io = ppms [i2] class = secop_psi.ppms.Channel .description = current channel 2 .no = 2 value.unit = uA -.iodev = ppms +.io = ppms [i3] class = secop_psi.ppms.Channel .description = current channel 3 .no = 3 value.unit = uA -.iodev = ppms +.io = ppms [i4] class = secop_psi.ppms.Channel .description = current channel 4 .no = 4 value.unit = uA -.iodev = ppms +.io = ppms [v1] class = secop_psi.ppms.DriverChannel .description = voltage channel 1 .no = 1 value.unit = V -.iodev = ppms +.io = ppms [v2] class = secop_psi.ppms.DriverChannel .description = voltage channel 2 .no = 2 value.unit = V -.iodev = ppms +.io = ppms [tv] class = secop_psi.ppms.UserChannel @@ -108,7 +108,7 @@ class = secop_psi.ppms.UserChannel enabled = 0 linkenable = ts value.unit = K -.iodev = ppms +.io = ppms [ts] class = secop_psi.ppms.UserChannel @@ -116,7 +116,7 @@ class = secop_psi.ppms.UserChannel enabled = 0 linkenable = tv value.unit = K -.iodev = ppms +.io = ppms [ppms] class = secop_psi.ppms.Main diff --git a/cfg/prep2.cfg b/cfg/prep2.cfg index 3b012d8..d8e91b1 100644 --- a/cfg/prep2.cfg +++ b/cfg/prep2.cfg @@ -12,12 +12,12 @@ uri = tcp://samenv.psi.ch:8642 [module tt] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = tt.ori1.config remote_paths = . [module nv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = nv.ori1.config remote_paths = . diff --git a/cfg/prep5.cfg b/cfg/prep5.cfg index 260cf20..7fb66b3 100644 --- a/cfg/prep5.cfg +++ b/cfg/prep5.cfg @@ -12,108 +12,108 @@ uri = tcp://samenv.psi.ch:8645 [module tt] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = tt.ma11.config remote_paths = . [module nv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = nv.ma11.config remote_paths = . [module ln2fill] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ln2fill.ma11.config remote_paths = . [module hefill] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = hefill.ma11.config remote_paths = . [module tcoil] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tcoil.ma11.config remote_paths = . [module table] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = table.ma11.config remote_paths = . [module lnv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = lnv.ma11.config remote_paths = . [module lpr] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = lpr.ma11.config remote_paths = . [module lambdawatch] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = lambdawatch.ma11.config remote_paths = . [module ts] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = ts.dil4.stick remote_paths = . [module treg] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = treg.dil4.stick remote_paths = . [module tmon] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tmon.dil4.stick remote_paths = . [module sorb] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = sorb.dil4.stick remote_paths = . [module ultrasound] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ultrasound.ultrasound.addon remote_paths = . [module fn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = fn.ultrasound.addon remote_paths = . [module mirror] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = mirror.ultrasound.addon remote_paths = . [module f] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = f.ultrasound.addon remote_paths = . [module pars] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pars.ultrasound.addon remote_paths = . diff --git a/cfg/prep6.cfg b/cfg/prep6.cfg index 7350d68..a3509c7 100644 --- a/cfg/prep6.cfg +++ b/cfg/prep6.cfg @@ -12,54 +12,54 @@ uri = tcp://samenv.psi.ch:8646 [module tvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvs.varioxB.config remote_paths = . [module tvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvd.varioxB.config remote_paths = . [module pstat] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pstat.varioxB.config remote_paths = . [module pdyn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pdyn.varioxB.config remote_paths = . [module tneck1] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck1.varioxB.config remote_paths = . [module tneck2] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck2.varioxB.config remote_paths = . [module tnvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvs.varioxB.config remote_paths = . [module tnvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvd.varioxB.config remote_paths = . [module ts] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ts.vb.stick remote_paths = . diff --git a/cfg/sea/ccr2ht.cfg b/cfg/sea/ccr2ht.cfg index 9dc6304..5b54a47 100644 --- a/cfg/sea/ccr2ht.cfg +++ b/cfg/sea/ccr2ht.cfg @@ -6,15 +6,15 @@ service = main [tt] class = secop_psi.sea.SeaDrivable -iodev = sea_main +io = sea_main sea_object = tt [cc] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = cc [table] class = secop_psi.sea.SeaReadable -iodev = sea_main +io = sea_main sea_object = table diff --git a/cfg/sea/focus-be-filter.cfg b/cfg/sea/focus-be-filter.cfg index 379a7b6..9fdd2f4 100644 --- a/cfg/sea/focus-be-filter.cfg +++ b/cfg/sea/focus-be-filter.cfg @@ -10,10 +10,10 @@ service = addons [cryo] class = secop_psi.sea.SeaReadable -iodev = sea_addons +io = sea_addons sea_object = cryo [addonlock_focus-be-filter] class = secop_psi.sea.SeaWritable -iodev = sea_addons +io = sea_addons sea_object = addonlock_focus-be-filter diff --git a/cfg/sea/ma11_dil4_ultrasound_sr.cfg b/cfg/sea/ma11_dil4_ultrasound_sr.cfg index 260cf20..7fb66b3 100644 --- a/cfg/sea/ma11_dil4_ultrasound_sr.cfg +++ b/cfg/sea/ma11_dil4_ultrasound_sr.cfg @@ -12,108 +12,108 @@ uri = tcp://samenv.psi.ch:8645 [module tt] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = tt.ma11.config remote_paths = . [module nv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = nv.ma11.config remote_paths = . [module ln2fill] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ln2fill.ma11.config remote_paths = . [module hefill] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = hefill.ma11.config remote_paths = . [module tcoil] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tcoil.ma11.config remote_paths = . [module table] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = table.ma11.config remote_paths = . [module lnv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = lnv.ma11.config remote_paths = . [module lpr] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = lpr.ma11.config remote_paths = . [module lambdawatch] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = lambdawatch.ma11.config remote_paths = . [module ts] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = ts.dil4.stick remote_paths = . [module treg] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = treg.dil4.stick remote_paths = . [module tmon] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tmon.dil4.stick remote_paths = . [module sorb] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = sorb.dil4.stick remote_paths = . [module ultrasound] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ultrasound.ultrasound.addon remote_paths = . [module fn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = fn.ultrasound.addon remote_paths = . [module mirror] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = mirror.ultrasound.addon remote_paths = . [module f] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = f.ultrasound.addon remote_paths = . [module pars] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pars.ultrasound.addon remote_paths = . diff --git a/cfg/sea/ori1.cfg b/cfg/sea/ori1.cfg index 3b012d8..d8e91b1 100644 --- a/cfg/sea/ori1.cfg +++ b/cfg/sea/ori1.cfg @@ -12,12 +12,12 @@ uri = tcp://samenv.psi.ch:8642 [module tt] class = secop_psi.sea.SeaDrivable -iodev = seaconn +io = seaconn json_descr = tt.ori1.config remote_paths = . [module nv] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = nv.ori1.config remote_paths = . diff --git a/cfg/sea/test_secop4.cfg b/cfg/sea/test_secop4.cfg index b7ba07b..879de42 100644 --- a/cfg/sea/test_secop4.cfg +++ b/cfg/sea/test_secop4.cfg @@ -12,6 +12,6 @@ uri = tcp://samenv.psi.ch:8642 [module secop] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = secop.test_secop4.config remote_paths = . diff --git a/cfg/sea/varioxB_vb.cfg b/cfg/sea/varioxB_vb.cfg index 7350d68..a3509c7 100644 --- a/cfg/sea/varioxB_vb.cfg +++ b/cfg/sea/varioxB_vb.cfg @@ -12,54 +12,54 @@ uri = tcp://samenv.psi.ch:8646 [module tvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvs.varioxB.config remote_paths = . [module tvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvd.varioxB.config remote_paths = . [module pstat] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pstat.varioxB.config remote_paths = . [module pdyn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pdyn.varioxB.config remote_paths = . [module tneck1] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck1.varioxB.config remote_paths = . [module tneck2] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck2.varioxB.config remote_paths = . [module tnvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvs.varioxB.config remote_paths = . [module tnvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvd.varioxB.config remote_paths = . [module ts] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = ts.vb.stick remote_paths = . diff --git a/cfg/stick/ill5stick.cfg b/cfg/stick/ill5stick.cfg index 07e8de5..0b26ed9 100644 --- a/cfg/stick/ill5stick.cfg +++ b/cfg/stick/ill5stick.cfg @@ -10,7 +10,7 @@ service = stick [ts] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = tt json_file = ill5.config.json rel_paths = ts diff --git a/cfg/stick/ma11stick.cfg b/cfg/stick/ma11stick.cfg index f0eb393..a162ad1 100644 --- a/cfg/stick/ma11stick.cfg +++ b/cfg/stick/ma11stick.cfg @@ -10,7 +10,7 @@ service = stick [ts] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = tt json_file = ma11.config.json rel_paths = ts diff --git a/cfg/stick/ma7stick.cfg b/cfg/stick/ma7stick.cfg index b66a1eb..b6e606e 100644 --- a/cfg/stick/ma7stick.cfg +++ b/cfg/stick/ma7stick.cfg @@ -10,7 +10,7 @@ service = stick [ts] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = tt json_file = ma7.config.json rel_paths = ts diff --git a/cfg/stick/ori4stick.cfg b/cfg/stick/ori4stick.cfg index a24e45a..f1fdb9c 100644 --- a/cfg/stick/ori4stick.cfg +++ b/cfg/stick/ori4stick.cfg @@ -10,7 +10,7 @@ service = stick [ts] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = tt json_file = ori4.config.json rel_paths = ts diff --git a/cfg/stick/sch5.cfg b/cfg/stick/sch5.cfg index 4475c48..d57ae97 100644 --- a/cfg/stick/sch5.cfg +++ b/cfg/stick/sch5.cfg @@ -10,12 +10,12 @@ service = stick [warmup] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = warmup [ts] class = secop_psi.sea.SeaReadable -iodev = sea_stick +io = sea_stick sea_object = tt json_file = ori4.config.json rel_paths = ts diff --git a/cfg/test_ppms_mf.cfg b/cfg/test_ppms_mf.cfg index 014e26a..88b2749 100644 --- a/cfg/test_ppms_mf.cfg +++ b/cfg/test_ppms_mf.cfg @@ -9,62 +9,62 @@ bindport = 5000 #[module tt] #class = secop_psi.ppms.Temp #.description = main temperature -#iodev = ppms +#io = ppms [module mf] class = secop_psi.ppms.Field .description = magnetic field -iodev = ppms +io = ppms #[module pos] #class = secop_psi.ppms.Position #.description = sample rotator -#iodev = ppms +#io = ppms #[module lev] #class = secop_psi.ppms.Level #.description = helium level -#iodev = ppms +#io = ppms #[module chamber] #class = secop_psi.ppms.Chamber #.description = chamber state -#iodev = ppms +#io = ppms #[module r1] #class = secop_psi.ppms.BridgeChannel #.description = resistivity channel 1 #no = 1 #value.unit = Ohm -#iodev = ppms +#io = ppms #[module i1] #class = secop_psi.ppms.Channel #.description = current channel 1 #no = 1 #value.unit = uA -#iodev = ppms +#io = ppms #[module v1] #class = secop_psi.ppms.DriverChannel #.description = voltage channel 1 #no = 1 #value.unit = V -#iodev = ppms +#io = ppms #[module tv] #class = secop_psi.ppms.UserChannel #.description = VTI temperature #enabled = 1 #value.unit = K -#iodev = ppms +#io = ppms #[module ts] #class = secop_psi.ppms.UserChannel #.description = sample temperature #enabled = 1 #value.unit = K -#iodev = ppms +#io = ppms [module ppms] class = secop_psi.ppms.Main diff --git a/cfg/trinamic.cfg b/cfg/trinamic.cfg index ca375e3..6d7424e 100644 --- a/cfg/trinamic.cfg +++ b/cfg/trinamic.cfg @@ -5,7 +5,7 @@ description = trinamic motor test [INTERFACE] uri = tcp://5000 -[drv_iodev] +[drv_io] description = class = secop.core.BytesIO uri = serial:///dev/tty.usbserial?baudrate=57600 @@ -14,7 +14,7 @@ uri = serial:///dev/tty.usbserial?baudrate=57600 [drv] description = trinamic motor test class = secop_psi.trinamic.Motor -iodev = drv_iodev +io = drv_io standby_current=0.1 maxcurrent=1.4 acceleration=150. diff --git a/cfg/uniax.cfg b/cfg/uniax.cfg index da86987..9a03b8b 100644 --- a/cfg/uniax.cfg +++ b/cfg/uniax.cfg @@ -11,7 +11,7 @@ class = secop_psi.uniax.Uniax motor = drv transducer = transducer -#[drv_iodev] +#[drv_io] #description = #class = secop.core.BytesIO # uri = serial:///dev/ttyUSB1?baudrate=57600 @@ -20,7 +20,7 @@ transducer = transducer [drv] description = trinamic motor test class = secop_psi.trinamic.Motor -# iodev = drv_iodev +# io = drv_io uri = tcp://192.168.127.254:3002 standby_current=0.1 maxcurrent=0.2 diff --git a/cfg/varioxb.cfg b/cfg/varioxb.cfg index a015874..77a99a3 100644 --- a/cfg/varioxb.cfg +++ b/cfg/varioxb.cfg @@ -12,49 +12,49 @@ uri = tcp://samenv.psi.ch:8646 [module tvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvs.varioxB.config remote_paths = . [module tvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tvd.varioxB.config remote_paths = . [module pstat] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pstat.varioxB.config remote_paths = . [module pdyn] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = pdyn.varioxB.config remote_paths = . [module tneck1] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck1.varioxB.config remote_paths = . [module tneck2] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tneck2.varioxB.config remote_paths = . [module tnvs] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvs.varioxB.config remote_paths = . [module tnvd] class = secop_psi.sea.SeaReadable -iodev = seaconn +io = seaconn json_descr = tnvd.varioxB.config remote_paths = .