From 1cf200dab160f0d9a01a9ea9c8e22a5e5bee7956 Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 31 Aug 2016 17:19:16 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- devices/camtool.properties | 8 ++++---- script/Alignment/Gun_solenoid_alignment.py | 4 ++-- script/Alignment/Laser_gun_alignment.py | 4 ++-- script/camtool.py | 6 +++--- script/local.py | 4 ++++ 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 3a9d9b1..1f6bf0d 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -22,4 +22,4 @@ gsx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:X_SP SINEG01-MSOL130:X|||true gsy=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:Y_SP SINEG01-MSOL130:Y|||true gsrx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_X_SP SINEG01-MSOL130:ROT_X|||true gsry=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_Y_SP SINEG01-MSOL130:ROT_Y|||true -camtool=Camtool|SINEG01-DSCR190||-500| +#camtool=Camtool|SINEG01-DSCR190||-500| diff --git a/devices/camtool.properties b/devices/camtool.properties index a244c54..da6f026 100644 --- a/devices/camtool.properties +++ b/devices/camtool.properties @@ -1,8 +1,8 @@ -#Wed Aug 31 17:09:01 CEST 2016 -colormap=Grayscale +#Wed Aug 31 17:12:46 CEST 2016 +colormap=Temperature colormapAutomatic=false -colormapMax=484.051 -colormapMin=0.0 +colormapMax=578.797 +colormapMin=99.793 flipHorizontally=false flipVertically=false grayscale=false diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index 5091e87..7f96be1 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -47,8 +47,8 @@ else: if get_device("image_stats") is None: print "Instantiating camtool" add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) - if (latch): - image_stats.start() + if (latch): + image_stats.start() #add_device(ImageStats("image_stats", get_simulated_source(image)), True) image_stats.setNumberOfImages(max(number_images,1)) diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py index 0e6a4f3..34805c5 100755 --- a/script/Alignment/Laser_gun_alignment.py +++ b/script/Alignment/Laser_gun_alignment.py @@ -47,8 +47,8 @@ else: if get_device("image_stats") is None: print "Instantiating camtool" add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) - if (latch): - image_stats.start() + if (latch): + image_stats.start() #add_device(ImageStats("image_stats", get_simulated_source(image)), True) image_stats.setNumberOfImages(max(number_images,1)) diff --git a/script/camtool.py b/script/camtool.py index 7b1b114..d5edde6 100644 --- a/script/camtool.py +++ b/script/camtool.py @@ -212,10 +212,8 @@ finally: print "" - +""" if __name__ == "__builtin__": - camera_tool = CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = True, camera = "SINEG01-DSCR190") - add_device(image_stats, True) #image_stats.enableBackground(False) image_stats.enableBackground(False) #image_stats.captureBackground(5) @@ -228,4 +226,6 @@ if __name__ == "__builtin__": #camera_tool.enableBackground(True) #camera_tool.capture() #print camera_tool.take(), camera_tool.com_x.read(), camera_tool.com_y.read() + + """ \ No newline at end of file diff --git a/script/local.py b/script/local.py index 3506db8..c8bd4ca 100755 --- a/script/local.py +++ b/script/local.py @@ -179,6 +179,10 @@ center_x.setPolling(100) center_y.setPolling(100) +run("camtool") +add_device(CamTool("image_stats", prefix = "SINEG01-DSCR190:", latch = latch, camera = "SINEG01-DSCR190"), True) + + #Convex hull plots def clear_convex_hull_plot(title): plots = get_plots(title = title)