diff --git a/devices/m1.properties b/devices/m1.properties index 066870fb..ff760b77 100644 --- a/devices/m1.properties +++ b/devices/m1.properties @@ -1,4 +1,4 @@ -#Mon Nov 02 17:56:21 CET 2015 +#Mon Jun 24 14:26:01 CEST 2019 accessType=ReadWrite defaultSpeed=1.0 estbilizationDelay=0 @@ -9,5 +9,8 @@ minValue=-10.0 offset=0.0 precision=2 resolution=NaN +rotation=false scale=1.0 +sign_bit=0 +startRetries=1 unit=mm diff --git a/devices/m2.properties b/devices/m2.properties index 066870fb..ff760b77 100644 --- a/devices/m2.properties +++ b/devices/m2.properties @@ -1,4 +1,4 @@ -#Mon Nov 02 17:56:21 CET 2015 +#Mon Jun 24 14:26:01 CEST 2019 accessType=ReadWrite defaultSpeed=1.0 estbilizationDelay=0 @@ -9,5 +9,8 @@ minValue=-10.0 offset=0.0 precision=2 resolution=NaN +rotation=false scale=1.0 +sign_bit=0 +startRetries=1 unit=mm diff --git a/devices/p1.properties b/devices/p1.properties index 148c4389..138b3e81 100644 --- a/devices/p1.properties +++ b/devices/p1.properties @@ -1,4 +1,4 @@ -#Tue Apr 17 09:01:06 CEST 2018 +#Mon Jun 24 14:26:01 CEST 2019 maxValue=1000.0 minValue=0.0 offset=0.0 @@ -6,4 +6,5 @@ precision=-1 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=mm diff --git a/devices/src1.properties b/devices/src1.properties index b0220492..9c241392 100644 --- a/devices/src1.properties +++ b/devices/src1.properties @@ -1,6 +1,7 @@ -#Tue Sep 06 10:00:18 CEST 2016 +#Mon Jun 24 14:26:01 CEST 2019 colormap=Temperature colormapAutomatic=true +colormapLogarithmic=false colormapMax=255.0 colormapMin=0.0 dataMonitoring=false diff --git a/devices/src2.properties b/devices/src2.properties index dcf8f430..73572aa0 100644 --- a/devices/src2.properties +++ b/devices/src2.properties @@ -1,6 +1,7 @@ -#Tue Sep 06 10:00:18 CEST 2016 +#Mon Jun 24 14:26:01 CEST 2019 colormap=Grayscale colormapAutomatic=true +colormapLogarithmic=false colormapMax=255.0 colormapMin=0.0 dataMonitoring=false diff --git a/script/users/EmpaMarco.py b/script/users/EmpaMarco.py index 8b94ecd5..57693362 100644 --- a/script/users/EmpaMarco.py +++ b/script/users/EmpaMarco.py @@ -17,7 +17,8 @@ try: [0.0, ENERGY_HIGH], [0.001 * STEPS, ENERGY_LOW], [STEPS, 1], - latency = SETTLING_TIME, + latency = SETTLING_TIME, + keep=False, before_read = before_readout, after_read = after_readout) finally: if ENDSCAN: diff --git a/script/users/EmpaMarcoMultiple.py b/script/users/EmpaMarcoMultiple.py index 661b4587..16d6289b 100644 --- a/script/users/EmpaMarcoMultiple.py +++ b/script/users/EmpaMarcoMultiple.py @@ -32,6 +32,7 @@ try: domain_axis = "Index", enabled_plots = POSITIONERS + SENSORS, line_plots = [EnergyDistribution,], + keep=False, before_read = before_readout, after_read = after_readout )