From 489e301675f644c6fb05daec4275d64d9740a9c8 Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Thu, 22 Aug 2019 16:30:42 +0200 Subject: [PATCH] Startup --- devices/chi.properties | 3 ++- devices/delta.properties | 3 ++- devices/eta.properties | 3 ++- devices/gamma.properties | 3 ++- devices/motor.properties | 3 ++- devices/motor2.properties | 3 ++- devices/mu.properties | 3 ++- devices/phi.properties | 3 ++- script/cpython/image_functions.py | 2 -- 9 files changed, 16 insertions(+), 10 deletions(-) diff --git a/devices/chi.properties b/devices/chi.properties index 5755c6a..5789fcb 100644 --- a/devices/chi.properties +++ b/devices/chi.properties @@ -1,10 +1,11 @@ -#Fri Aug 24 11:05:04 CEST 2018 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=50.0 estbilizationDelay=0 maxSpeed=50.0 maxValue=360.0 minSpeed=0.1 minValue=-360.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/devices/delta.properties b/devices/delta.properties index 8680446..7adb232 100644 --- a/devices/delta.properties +++ b/devices/delta.properties @@ -1,10 +1,11 @@ -#Mon Feb 11 17:24:00 CET 2019 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=50.0 estbilizationDelay=0 maxSpeed=50.0 maxValue=190.0 minSpeed=0.1 minValue=-19.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/devices/eta.properties b/devices/eta.properties index 5fe774f..8dcfd70 100644 --- a/devices/eta.properties +++ b/devices/eta.properties @@ -1,10 +1,11 @@ -#Mon Feb 11 17:20:20 CET 2019 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=50.0 estbilizationDelay=0 maxSpeed=50.0 maxValue=189.0 minSpeed=0.1 minValue=-190.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/devices/gamma.properties b/devices/gamma.properties index 27b77b2..e540ac5 100644 --- a/devices/gamma.properties +++ b/devices/gamma.properties @@ -1,10 +1,11 @@ -#Mon Feb 11 17:19:49 CET 2019 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=50.0 estbilizationDelay=0 maxSpeed=50.0 maxValue=164.0 minSpeed=0.1 minValue=-61.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/devices/motor.properties b/devices/motor.properties index 69eec92..8e52640 100755 --- a/devices/motor.properties +++ b/devices/motor.properties @@ -1,4 +1,4 @@ -#Fri Jun 22 08:53:29 CEST 2018 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=true @@ -7,6 +7,7 @@ maxSpeed=20.0 maxValue=75.0 minSpeed=0.001 minValue=-5.0 +monitorByPosition=false offset=0.0 precision=4 resolution=0.00125 diff --git a/devices/motor2.properties b/devices/motor2.properties index 2bb0f23..197cf8a 100755 --- a/devices/motor2.properties +++ b/devices/motor2.properties @@ -1,4 +1,4 @@ -#Tue Oct 16 15:21:38 CEST 2018 +#Thu Aug 22 16:30:36 CEST 2019 accessType=ReadWrite channel=MTEST-GOBBO\:MOT2 defaultSpeed=0.2 @@ -10,6 +10,7 @@ maxSpeed=100.0 maxValue=100.0 minSpeed=0.001 minValue=-100.0 +monitorByPosition=false offset=10.0 precision=3 resolution=NaN diff --git a/devices/mu.properties b/devices/mu.properties index f5dc462..fe59d0d 100644 --- a/devices/mu.properties +++ b/devices/mu.properties @@ -1,10 +1,11 @@ -#Thu Aug 15 15:28:35 CEST 2019 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=0.2 estbilizationDelay=0 maxSpeed=50.0 maxValue=116.0 minSpeed=0.1 minValue=-13.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/devices/phi.properties b/devices/phi.properties index 72e893a..5789fcb 100644 --- a/devices/phi.properties +++ b/devices/phi.properties @@ -1,10 +1,11 @@ -#Fri Aug 24 11:05:11 CEST 2018 +#Thu Aug 22 16:30:36 CEST 2019 defaultSpeed=50.0 estbilizationDelay=0 maxSpeed=50.0 maxValue=360.0 minSpeed=0.1 minValue=-360.0 +monitorByPosition=false offset=0.0 precision=2 resolution=NaN diff --git a/script/cpython/image_functions.py b/script/cpython/image_functions.py index f56ac1f..eb6f4e9 100644 --- a/script/cpython/image_functions.py +++ b/script/cpython/image_functions.py @@ -1,6 +1,4 @@ import numpy -import time - from scipy import signal, ndimage def img_get_int(fname, thres1, thres2, thres3, thres4, header, width, height, depth, x1,y1,x2,y2, bx1,by1,bx2,by2 , filter_median = False, filter_nsigma = 0):