Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea

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,14 +98,15 @@ 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 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:
+                os.makedirs(logdir+variable)
+                print(gzdir, variable, '.gz')
                 if os.path.isfile(gzdir + variable + '.gz'):
                     expand(logdir, gzdir, variable)
                 else:

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
 

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 start trinamic::startCmd
-  prop startcmd "str1 n int 10 / str9"
+  # prop startcmd "str1 n int 10 / str9"
 
   pollperiod 5 5
 

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"

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"
+set ::secop_version 4
-
-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  
-}
 
+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

tcl/mb11.stick

@@ -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

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