From 81aaaa8a8c4282db31bb9aa125db55ef71e26664 Mon Sep 17 00:00:00 2001 From: sans Date: Thu, 1 Sep 2022 17:03:26 +0200 Subject: [PATCH 1/6] it seems this is a useful change (compress.py) --- compress_logger/compress.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/compress_logger/compress.py b/compress_logger/compress.py index f7ca2f0..4622afd 100644 --- a/compress_logger/compress.py +++ b/compress_logger/compress.py @@ -78,6 +78,7 @@ def treat(action, instrument='', years='past', vars=None): logbase = '%slogger/' % instdir(instrument) gzbase = '%sgzlogger/' % instdir(instrument) os.chdir(logbase) + print('chdir', logbase, gzbase) if years == 'all': yrs = list(glob('20*')) elif years == 'past': @@ -97,18 +98,19 @@ def treat(action, instrument='', years='past', vars=None): else: varlist = vars for variable in varlist: - # print logdir+variable - if os.path.isdir(logdir+variable): - if action == COMPRESS: + if action == COMPRESS: + if os.path.isdir(logdir+variable): if not os.path.isfile(gzdir + variable + '.gz'): t0 = time.time() compress(logdir, gzdir, variable) time.sleep(min(1.0, time.time()-t0)) # be nice - elif action == EXPAND: - if os.path.isfile(gzdir + variable + '.gz'): - expand(logdir, gzdir, variable) - else: - print '%s is missing' % (gzdir + variable + '.gz') + elif action == EXPAND: + os.makedirs(logdir+variable) + print(gzdir, variable, '.gz') + if os.path.isfile(gzdir + variable + '.gz'): + expand(logdir, gzdir, variable) + else: + print '%s is missing' % (gzdir + variable + '.gz') if __name__ == '__main__': action = COMPRESS From f3581a4ddad73e8e89a374ad6cabb99ed0ddb32c Mon Sep 17 00:00:00 2001 From: hrpt Date: Tue, 6 Sep 2022 12:22:11 +0200 Subject: [PATCH 2/6] fix bad startcmd startcmd was assuming we are connected to a sensirion flowmeter! this is not the case for nvmot, the mv motor on ORI4. produced a lot of headache ... --- tcl/drivers/trinamic.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/drivers/trinamic.tcl b/tcl/drivers/trinamic.tcl index 028eb9e..72fbdc1 100644 --- a/tcl/drivers/trinamic.tcl +++ b/tcl/drivers/trinamic.tcl @@ -46,8 +46,8 @@ proc stdConfig::trinamic {{usage undefined} {sensirion 0}} { variable node set node $node/tasks set tasknode $node - # prop start trinamic::startCmd - prop startcmd "str1 n int 10 / str9" + prop start trinamic::startCmd + # prop startcmd "str1 n int 10 / str9" pollperiod 5 5 From 5204154dca1c05ea5b09bbba4dd880f06ff339a8 Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 12 Sep 2022 15:10:10 +0200 Subject: [PATCH 3/6] change name of n.v. settings --- tcl/drivers/sensirion.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/drivers/sensirion.tcl b/tcl/drivers/sensirion.tcl index 06a0702..c33f999 100644 --- a/tcl/drivers/sensirion.tcl +++ b/tcl/drivers/sensirion.tcl @@ -18,7 +18,7 @@ proc stdConfig::sensirion {} { prop read stdSct::read prop update sensirion::updateFlow - kids "$name settings" { + kids "n.v. flow" { node stddev upd From 4c5e279b73bcc3d95a3b51d9382552bf7081b5cb Mon Sep 17 00:00:00 2001 From: camea Date: Mon, 12 Sep 2022 15:10:47 +0200 Subject: [PATCH 4/6] mb11 config file uses frappy now --- tcl/mb11.config | 90 +++---------------------------------------------- tcl/mb11.stick | 9 ----- 2 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 tcl/mb11.stick diff --git a/tcl/mb11.config b/tcl/mb11.config index 7544705..be7313c 100644 --- a/tcl/mb11.config +++ b/tcl/mb11.config @@ -1,89 +1,7 @@ -deviceDesc = 11 Tesla vertical 100mm cryomagnet +deviceDesc = FRAPPY history recorder, with stick -device stick_menu "mb11 dil5 varioxB" - -makenv tvs -driver itctemp -port mb11-ts:3001 -controller _tt DB6.T1 DB1.H1 -GraphAdd tvs K T_VTIs red -GraphAdd tvs.set K T_stat_set orange -GraphAdd tvs.pow W pow_tvs red -# GraphAdd tvs.raw Ohm R_tvs red - -makenv tvd -driver itctemp -port mb11-ts:3001 -controller _tt DB7.T1 DB2.H1 -GraphAdd tvd K T_VTId magenta -GraphAdd tvd.set K T_dyn_set violet -GraphAdd tvd.pow W pow_tvd magenta -# GraphAdd tvd.raw Ohm R_tvd magenta - -makeIpsLev -port mb11-ts:3003 -controller _mf -slot DB1 - -makenv pstat -driver itcpress -port mb11-ts:3001 -controller _tt DB5.P1 DB3.G1 -GraphAdd pstat mbar p_stat -# GraphAdd pstat.pos % nv_stat -GraphAdd pstat.set mbar p_stat_set - -makenv pdyn -driver itcpress -port mb11-ts:3001 -controller _tt DB8.P1 DB4.G1 -GraphAdd pdyn mbar p_dyn -# GraphAdd pdyn.pos % nv_dyn -GraphAdd pdyn.set mbar p_dyn_set - -makenv tneck1 -driver itctemp -port mb11-ts:3002 -controller _ta MB1.T1 MB0.H1 -makenv tneck2 -driver itctemp -port mb11-ts:3002 -controller _ta DB6.T1 DB1.H1 -makenv tnvs -driver itctemp -port mb11-ts:3002 -controller _ta DB7.T1 DB2.H1 -makenv tnvd -driver itctemp -port mb11-ts:3002 -controller _ta DB8.T1 DB3.H1 - -# GraphAdd tneck1 K_2 T_neck1 -# GraphAdd tneck1.pow W pow_neck1 -# GraphAdd tneck2 K_2 T_neck2 -# GraphAdd tneck2.pow W pow_neck2 -# GraphAdd tnvs K_2 T_nvs -# GraphAdd tnvs.pow W pow_nvs -# GraphAdd tnvd K_2 T_nvd -# GraphAdd tnvd.pow W pow_nvd - -makenv mf -driver ipsmag -port mb11-ts:3003 -controller _mf -makeCCU4 mb11 -makeHeFill ccu4ilm -makeN2Fill ccu4ilm { - ln2fill lowlevel 10 - ln2fill highlevel 90 - ln2fill minfillminutes 8 - ln2fill maxfillminutes 60 - ln2fill minholdhours 12 - ln2fill maxholdhours 96 -} +set ::secop_version 4 +makenv frappy_main -driver secop -port localhost:15101 +makenv frappy_stick -driver secop -port localhost:15201 makeHePump - -GraphAdd mf T mf -GraphAdd mf.ips.leads_meas T mf_leads green -GraphAdd mf.ips.slave1 A I_master red -GraphAdd mf.ips.slave2 A I_slave2 green -GraphAdd mf.ips.slave3 A I_slavw3 blue - - -hupdate /mf/ips/symode symmetric -mf gen/profile 11:0.25 -mf gen/profile_training 11:0.25 - -mf gen/limit 10 - -mf gen/wait_switch_on 60 -mf gen/wait_switch_off 60 -mf gen/wait_stable_leads 5 -mf gen/wait_stable_field 30 - -makeCCU4 mb11 -makeN2Fill ccu4ilm { - ln2fill lowlevel 10 - # ln2fill highlevel 95 - ln2fill minfillminutes 8 - ln2fill maxfillminutes 40 - ln2fill minholdhours 24 - ln2fill maxholdhours 96 - # appendVars ln2fill.smooth/%/N2smooth/13 -} - -makenv tcoil -driver itctemp -port mb11-ts:3003 -controller _mf MB1.T1 -# GraphAdd tcoil K_2 T_coil - -setstickrot mb11-ts:3004 diff --git a/tcl/mb11.stick b/tcl/mb11.stick deleted file mode 100644 index 8c33c56..0000000 --- a/tcl/mb11.stick +++ /dev/null @@ -1,9 +0,0 @@ -stickDesc = stick for MB11 - -defineTemperature ts - -makenv ts -driver itctemp -port mb11-ts:3001 -controller _tt MB1.T1 MB0.H1 -GraphAdd ts K T_sam blue -GraphAdd ts.set K T_sam_set cyan -GraphAdd ts.pow W pow_ts blue -GraphAdd ts.raw Ohm R_ts blue From 90a23d1ac5dfd1cc9d447971402da674328cf1f1 Mon Sep 17 00:00:00 2001 From: sans Date: Mon, 12 Sep 2022 15:43:55 +0200 Subject: [PATCH 5/6] add uniax.stick --- tcl/uniax.stick | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tcl/uniax.stick diff --git a/tcl/uniax.stick b/tcl/uniax.stick new file mode 100644 index 0000000..4927d3d --- /dev/null +++ b/tcl/uniax.stick @@ -0,0 +1,9 @@ +stickDesc = Uniax stick via SECoP on the apu (via network) + +set ::secop_version 4 + +makenv frappy-stick -driver secop -port linse-uniax:5000 + +stick_sensors undefined undefined + +defineTemperature t From 975f6b38a0d06cd45d8bf4a4636044ba6cfdb9ae Mon Sep 17 00:00:00 2001 From: eiger Date: Thu, 15 Sep 2022 12:55:36 +0200 Subject: [PATCH 6/6] add comment about i1 --- tcl/ill5pgas5.config | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl/ill5pgas5.config b/tcl/ill5pgas5.config index e2def36..faf9b82 100644 --- a/tcl/ill5pgas5.config +++ b/tcl/ill5pgas5.config @@ -32,6 +32,7 @@ makenv pccu -driver ccu4 pressure_ccu makenv p -driver ccupressure pccu 28 GraphAdd p bar p auto +# needed for TASMAD: must be drivable makenv i1 -driver drvpar /p hsetprop /tc group "capillary temperature"