From 1d710de372728d60c4bc0610a3966215ad7122bb Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Mon, 28 Sep 2020 11:22:13 +0200 Subject: [PATCH] way too many changes for git to be useful --- config/devices.properties | 1 + config/settings.properties | 9 +++++---- config/variables.properties | 4 ++-- devices/B1.properties | 2 +- devices/led_ctrl_1.properties | 2 +- devices/led_ctrl_2.properties | 2 +- devices/led_ctrl_3.properties | 2 +- devices/smart_magnet.properties | 12 +++++------ devices/smc_current.properties | 10 +++++----- script/devices/RobotSC.py | 2 +- script/motion/dry.py | 2 +- script/tasks/ColdPositionTimeout.py | 31 +++++++++++++++-------------- 12 files changed, 41 insertions(+), 38 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 5a012a6..7fdc211 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,3 +1,4 @@ +eh_door_lock=ch.psi.pshell.epics.ChannelString|X06SA-EH1-LAC:02_05|Read||true img=ch.psi.pshell.prosilica.Prosilica|204464 "PacketSize=1504;PixelFormat=Mono8;BinningX=1;BinningY=1;RegionX=290;RegionY=130;Width=1000;Height=1000;MulticastEnable=Off"||-200|false gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=1 reopen||-200|false monitoring_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200| diff --git a/config/settings.properties b/config/settings.properties index 75f7321..fd44480 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,12 +1,13 @@ -#Tue Sep 08 11:33:09 CEST 2020 +#Mon Sep 28 11:16:27 CEST 2020 dry_mount_counter=0 +mounted_sample_position=D55 room_temperature_enabled=false -pin_offset=0.0 +pin_offset=4.0 puck_types=true imaging_enabled=false -dry_timestamp=1.599547021734E9 +dry_timestamp=1.601024255965E9 roi_h=1000 -led_level=100.0 +led_level=0.0 beamline_status_enabled=false force_dry_mount_count=15 roi_y=123 diff --git a/config/variables.properties b/config/variables.properties index 85d4b4c..e71a626 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Sep 08 08:54:33 CEST 2020 -FileSequentialNumber=247 +#Wed Sep 16 14:05:05 CEST 2020 +FileSequentialNumber=251 diff --git a/devices/B1.properties b/devices/B1.properties index 22f2102..bdd9436 100644 --- a/devices/B1.properties +++ b/devices/B1.properties @@ -1,3 +1,3 @@ -#Mon Apr 29 16:18:33 CEST 2019 +#Wed Sep 16 08:50:16 CEST 2020 detection=Mechanical disabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index edc44b7..20e74ad 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,4 +1,4 @@ -#Fri Aug 21 12:46:01 CEST 2020 +#Wed Sep 16 13:43:58 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index edc44b7..20e74ad 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,4 +1,4 @@ -#Fri Aug 21 12:46:01 CEST 2020 +#Wed Sep 16 13:43:58 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index edc44b7..20e74ad 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,4 +1,4 @@ -#Fri Aug 21 12:46:01 CEST 2020 +#Wed Sep 16 13:43:58 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/smart_magnet.properties b/devices/smart_magnet.properties index 29bedad..259bb59 100644 --- a/devices/smart_magnet.properties +++ b/devices/smart_magnet.properties @@ -1,8 +1,8 @@ -#Tue Sep 17 13:46:27 CEST 2019 -holdingCurrent=50.0 -mountCurrent=30.0 -remanenceCurrent=-10.0 -restingCurrent=30.0 -reverseCurrent=-10.0 +#Thu Sep 24 14:17:37 CEST 2020 reverseTime=0.2 unmountCurrent=20.0 +holdingCurrent=50.0 +restingCurrent=30.0 +reverseCurrent=-10.0 +remanenceCurrent=-10.0 +mountCurrent=30.0 diff --git a/devices/smc_current.properties b/devices/smc_current.properties index 9d9ba17..6cd5133 100644 --- a/devices/smc_current.properties +++ b/devices/smc_current.properties @@ -1,9 +1,9 @@ -#Wed Jan 30 11:33:15 CET 2019 -maxValue=70.0 -minValue=-50.0 +#Tue Sep 15 15:20:57 CEST 2020 offset=0.0 +maxValue=90.0 precision=2 -resolution=NaN scale=0.003 -sign_bit=0 +resolution=NaN +minValue=-50.0 unit=mA +sign_bit=0 diff --git a/script/devices/RobotSC.py b/script/devices/RobotSC.py index c1e646d..1aa408a 100644 --- a/script/devices/RobotSC.py +++ b/script/devices/RobotSC.py @@ -85,7 +85,7 @@ class RobotSC(RobotTCP): def get_gonio(self): pin_offset = get_pin_offset() print "Pin offset = " + str(pin_offset) - self.start_task('getGonio', pin_offset) + self.start_task('getGonio', pin_offset) self.wait_task_finished(TASK_WAIT_ROBOT_POLLING) self.assert_gonio() self.last_command_position = "gonio" diff --git a/script/motion/dry.py b/script/motion/dry.py index bd59185..a70e878 100644 --- a/script/motion/dry.py +++ b/script/motion/dry.py @@ -1,5 +1,5 @@ DEFAULT_DRY_HEAT_TIME = 40.0 -DEFAULT_DRY_SPEED = 0.5 +DEFAULT_DRY_SPEED = 0.45 DEFAULT_DRY_WAIT_COLD = 30.0 def dry(heat_time=None, speed=None, wait_cold = None): diff --git a/script/tasks/ColdPositionTimeout.py b/script/tasks/ColdPositionTimeout.py index b61e0a0..61ec77e 100644 --- a/script/tasks/ColdPositionTimeout.py +++ b/script/tasks/ColdPositionTimeout.py @@ -1,20 +1,21 @@ -cold_position_timeout = int(get_setting("cold_position_timeout")) -if cold_position_timeout > 0: - if robot.last_command_position == "cold": - if (time.time() - robot.last_command_timestamp) > cold_position_timeout: - if robot.is_cold(): - log("Detected cold position timeout", False) - if get_context().state == State.Ready: - if robot.state == State.Ready: - if feedback_psys_safety.take() == True: - #TODO: Chan - get_context().evalLine("dry(wait_cold = -1)") #Dry and park : use get_context().evalLine to change application state +if "Locked" == eh_door_lock.getValue(): + cold_position_timeout = int(get_setting("cold_position_timeout")) + if cold_position_timeout > 0: + if robot.last_command_position == "cold": + if (time.time() - robot.last_command_timestamp) > cold_position_timeout: + if robot.is_cold(): + log("Detected cold position timeout", False) + if get_context().state == State.Ready: + if robot.state == State.Ready: + if feedback_psys_safety.take() == True: + #TODO: Chan + get_context().evalLine("dry(wait_cold = -1)") #Dry and park : use get_context().evalLine to change application state + else: + raise Exception("Cannot clear cold position: feedback_psys_safety = False ") else: - raise Exception("Cannot clear cold position: feedback_psys_safety = False ") + raise Exception("Cannot clear cold position: robot state: " + str(robot.state)) else: - raise Exception("Cannot clear cold position: robot state: " + str(robot.state)) - else: - raise Exception("Cannot clear cold position: system state: " + str(get_context().state)) + raise Exception("Cannot clear cold position: system state: " + str(get_context().state))