diff --git a/config/devices.properties b/config/devices.properties index 6a4d147..fa24ff9 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,5 @@ +magnet_position=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-DFS:CBOX-SENSOR1|Read||true +magnet_position_ok=ch.psi.pshell.epics.ChannelString|X10SA-ES-DF1:SN1-CMP|Read||true th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.118.200:502||| temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000| humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000| diff --git a/config/settings.properties b/config/settings.properties index 918cc74..f94f497 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,10 +1,11 @@ -#Tue Sep 08 11:44:29 CEST 2020 +#Fri Oct 02 16:34:52 CEST 2020 dry_mount_counter=0 +mounted_sample_position=D316 room_temperature_enabled=false -pin_offset=0.0 +pin_offset=-0.0 puck_types=true imaging_enabled=false -dry_timestamp=1.59953968313E9 +dry_timestamp=1.601637048912E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/config/variables.properties b/config/variables.properties index 9d02485..7fc84b4 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Sep 01 14:22:49 CEST 2020 -FileSequentialNumber=140 +#Wed Sep 30 10:51:37 CEST 2020 +FileSequentialNumber=145 diff --git a/devices/B1.properties b/devices/B1.properties index 1bb4486..5ce75c0 100644 --- a/devices/B1.properties +++ b/devices/B1.properties @@ -1,3 +1,3 @@ -#Tue Aug 18 11:35:05 CEST 2020 +#Tue Sep 22 08:45:34 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/C1.properties b/devices/C1.properties index 42e8813..4a2d931 100644 --- a/devices/C1.properties +++ b/devices/C1.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:31 CEST 2019 +#Wed Sep 23 08:55:15 CEST 2020 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/C5.properties b/devices/C5.properties index 354cfeb..d021913 100644 --- a/devices/C5.properties +++ b/devices/C5.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:43 CEST 2019 +#Thu Oct 01 11:36:19 CEST 2020 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/D1.properties b/devices/D1.properties index d83b456..61f54c3 100644 --- a/devices/D1.properties +++ b/devices/D1.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:48 CEST 2019 +#Tue Sep 22 08:45:39 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/D5.properties b/devices/D5.properties index 702b4ff..0efdeaa 100644 --- a/devices/D5.properties +++ b/devices/D5.properties @@ -1,3 +1,3 @@ -#Wed Aug 19 08:50:06 CEST 2020 +#Tue Sep 22 08:45:44 CEST 2020 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/E1.properties b/devices/E1.properties index 5399f6c..e3b32c7 100644 --- a/devices/E1.properties +++ b/devices/E1.properties @@ -1,3 +1,3 @@ -#Tue Aug 27 11:23:36 CEST 2019 +#Tue Sep 22 08:45:50 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/F2.properties b/devices/F2.properties index dce85b2..c3fc71f 100644 --- a/devices/F2.properties +++ b/devices/F2.properties @@ -1,3 +1,3 @@ -#Tue Sep 10 08:18:28 CEST 2019 +#Tue Sep 22 08:45:55 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 5ec0ee6..b9068e9 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,8 +1,8 @@ -#Tue Aug 18 13:34:46 CEST 2020 +#Fri Oct 02 15:05:45 CEST 2020 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 5ec0ee6..b9068e9 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,8 +1,8 @@ -#Tue Aug 18 13:34:46 CEST 2020 +#Fri Oct 02 15:05:45 CEST 2020 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 5ec0ee6..b9068e9 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,8 +1,8 @@ -#Tue Aug 18 13:34:46 CEST 2020 +#Fri Oct 02 15:05:45 CEST 2020 minValue=0.0 unit=V offset=0.0 -maxValue=1.0 +maxValue=0.4 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/plugins/MXSC-1.15.0.jar b/plugins/MXSC-1.15.0.jar new file mode 100644 index 0000000..2f19173 Binary files /dev/null and b/plugins/MXSC-1.15.0.jar differ diff --git a/script/devices/Wago.py b/script/devices/Wago.py index e0921a4..092cc2f 100644 --- a/script/devices/Wago.py +++ b/script/devices/Wago.py @@ -93,7 +93,7 @@ def release_psys(): ################################################################################################### # Drier ################################################################################################### -MAX_HEATER_TIME = 90000 +MAX_HEATER_TIME = 120000 def set_air_stream(state): """ diff --git a/script/motion/dry.py b/script/motion/dry.py index e41fd2d..8b048bd 100644 --- a/script/motion/dry.py +++ b/script/motion/dry.py @@ -1,6 +1,6 @@ -DEFAULT_DRY_HEAT_TIME = 40.0 -DEFAULT_DRY_SPEED = 0.35 -DEFAULT_DRY_WAIT_COLD = 35.0 +DEFAULT_DRY_HEAT_TIME = 45.0 +DEFAULT_DRY_SPEED = 0.4 +DEFAULT_DRY_WAIT_COLD = 40.0 def dry(heat_time=None, speed=None, wait_cold = None): """ diff --git a/script/motion/get_aux.py b/script/motion/get_aux.py index 67bfc7d..e816c4c 100644 --- a/script/motion/get_aux.py +++ b/script/motion/get_aux.py @@ -3,6 +3,7 @@ def get_aux(sample): """ print "get_aux: ",sample + sample = int(sample) #assert_valid_sample only acceps int as parameters #Initial checks assert_valid_sample(sample) diff --git a/script/motion/put_aux.py b/script/motion/put_aux.py index c41ee81..5fb97b3 100644 --- a/script/motion/put_aux.py +++ b/script/motion/put_aux.py @@ -2,7 +2,8 @@ def put_aux(sample): """ """ print "put_aux: ",sample - + + sample = int(sample) #assert_valid_sample only acceps int as parameters #Initial checks assert_valid_sample(sample) diff --git a/script/motion/scan_pin.py b/script/motion/scan_pin.py index 7683694..71ee78e 100644 --- a/script/motion/scan_pin.py +++ b/script/motion/scan_pin.py @@ -55,13 +55,53 @@ def scan_pin(segment, puck, sample, force=False): ret = str(dm) return ret + +def mount_pucks(pucks): + """mount evry position from the given pucks + + pucks is a list of puck specification in the format: [segment][puck] + + Example: mount_pucks(['c4', e3', 'e2', 'f1']) + """ + for p in pucks: + seg, puc = list(p) + seg = seg.upper() + puc = int(puc) + print "Mounting all positions from {} {}".format(seg.upper(), puc) + mount_puck_pins(seg, puc) + +def mount_puck_pins(segment, puck, positions=None): + """ Mounts every position from the given segment/puck.""" + from time import sleep + results = [] + + if positions is None: + positions = range(1, 17) + + for i in positions: + b = magnet_position.getValue() + mount(segment, puck, i, True, False, True) + a = magnet_position.getValue() + results.append((b, a)) + print "{:^8.3f}|{:^8.3f}".format(b, a) + sleep(1.0) + + # print results + print "{:^8s}|{:^8s}".format("Before", "After") + for b,a in results: + print "{:^8.3f}|{:^8.3f}".format(b, a) + def scan_puck(segment, puck, force=False): if segment == AUX_SEGMENT: raise Exception("Cannot scan auxiliary puck") ret = [] for i in range(16): + mgok = magnet_position_ok.getValue() + mgpos = magnet_position.getValue() + print "magnet sensor before: {} == {:.3f}".format(mgok, mgpos) ret.append(scan_pin (segment, puck, i+1, force)) + print "magnet sensor after: {} == {:.3f}".format(mgok, mgpos) return ret