From 1f5fcb7ad833427de4763cd1ecf82574fcebf0f4 Mon Sep 17 00:00:00 2001 From: panepucci Date: Wed, 6 Mar 2019 11:25:14 +0100 Subject: [PATCH] Startup --- config/config.properties | 4 +++- config/setup.properties | 3 ++- devices/aperture_x.properties | 3 ++- devices/beamstop_x.properties | 3 ++- devices/beamstop_y.properties | 3 ++- devices/beamstop_z.properties | 3 ++- devices/collimator_x.properties | 3 ++- devices/cryo_jet_tans.properties | 3 ++- devices/detector_y.properties | 3 ++- devices/detector_z.properties | 3 ++- devices/diode_z.properties | 3 ++- devices/flexor.properties | 3 ++- devices/frontlight.properties | 3 ++- devices/img1.properties | 3 ++- devices/prigo_chi.properties | 3 ++- devices/prigo_omega.properties | 3 ++- devices/prigo_phi.properties | 3 ++- devices/prigo_x.properties | 3 ++- devices/prigo_y.properties | 3 ++- devices/prigo_z.properties | 3 ++- devices/slit1h_center.properties | 3 ++- devices/slit1h_size.properties | 3 ++- devices/slit1v_center.properties | 3 ++- devices/slit1v_size.properties | 3 ++- devices/slit2h_center.properties | 3 ++- devices/slit2h_size.properties | 3 ++- devices/slit2v_center.properties | 3 ++- devices/slit2v_size.properties | 3 ++- devices/slithop neg blade.properties | 3 ++- devices/slithop pos blade.properties | 3 ++- devices/th1.properties | 3 ++- devices/th2.properties | 3 ++- devices/transmission.properties | 3 ++- devices/try3.properties | 3 ++- 34 files changed, 69 insertions(+), 34 deletions(-) diff --git a/config/config.properties b/config/config.properties index 47dc838..d5fdce5 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,5 +1,6 @@ -#Wed Mar 06 11:22:14 CET 2019 +#Wed Mar 06 11:24:59 CET 2019 autoSaveScanData=true +commandExecutionEvents=false createSessionFiles=false dataLayout=default dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} @@ -18,6 +19,7 @@ logLevel=Info logLevelConsole=Off logPath={logs}/{date}_{time} notificationLevel=null +saveCommandStatistics=false scanStreamerPort=-1 scanStreamingPort=-1 serverEnabled=true diff --git a/config/setup.properties b/config/setup.properties index 587c32f..8a97122 100644 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,7 +1,8 @@ -#Thu Sep 15 16:26:43 CEST 2016 +#Wed Mar 06 11:24:59 CET 2019 configFile={config}/config.properties configFileDevices={config}/devices.properties configFilePlugins={config}/plugins.properties +configFileSettings={config}/settings.properties configFileTasks={config}/tasks.properties configFileUpdateStrategy={config}/update.properties configPath={home}/config diff --git a/devices/aperture_x.properties b/devices/aperture_x.properties index eccfa7d..fb39dab 100644 --- a/devices/aperture_x.properties +++ b/devices/aperture_x.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.625 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=6.25E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/beamstop_x.properties b/devices/beamstop_x.properties index 287e929..05905ed 100644 --- a/devices/beamstop_x.properties +++ b/devices/beamstop_x.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=1.171875E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/beamstop_y.properties b/devices/beamstop_y.properties index 1b737c2..e89f577 100644 --- a/devices/beamstop_y.properties +++ b/devices/beamstop_y.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=1.171875E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/beamstop_z.properties b/devices/beamstop_z.properties index ab0a1af..f871112 100644 --- a/devices/beamstop_z.properties +++ b/devices/beamstop_z.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=60.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.03 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/collimator_x.properties b/devices/collimator_x.properties index eccfa7d..fb39dab 100644 --- a/devices/collimator_x.properties +++ b/devices/collimator_x.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.625 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=6.25E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/cryo_jet_tans.properties b/devices/cryo_jet_tans.properties index 1ac1388..c61d04b 100644 --- a/devices/cryo_jet_tans.properties +++ b/devices/cryo_jet_tans.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=2.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0025 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/detector_y.properties b/devices/detector_y.properties index b587bc2..806e63f 100644 --- a/devices/detector_y.properties +++ b/devices/detector_y.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=1.6 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=3.2E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/detector_z.properties b/devices/detector_z.properties index c314159..e7fada1 100644 --- a/devices/detector_z.properties +++ b/devices/detector_z.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=50.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=3 resolution=0.02 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/diode_z.properties b/devices/diode_z.properties index 3245104..cf1745f 100644 --- a/devices/diode_z.properties +++ b/devices/diode_z.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=7.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0075 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/flexor.properties b/devices/flexor.properties index 159ffce..0856330 100644 --- a/devices/flexor.properties +++ b/devices/flexor.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=78.125 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=3 resolution=0.15625 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=um diff --git a/devices/frontlight.properties b/devices/frontlight.properties index c4eabe4..66220e1 100644 --- a/devices/frontlight.properties +++ b/devices/frontlight.properties @@ -1,8 +1,9 @@ -#Fri Nov 20 16:51:44 CET 2015 +#Wed Mar 06 11:25:01 CET 2019 maxValue=5.0 minValue=0.0 offset=0.0 precision=2 resolution=NaN scale=1.0 +sign_bit=0 unit=units diff --git a/devices/img1.properties b/devices/img1.properties index 95d9188..65ece24 100644 --- a/devices/img1.properties +++ b/devices/img1.properties @@ -1,6 +1,7 @@ -#Thu Sep 15 16:26:48 CEST 2016 +#Wed Mar 06 11:25:01 CET 2019 colormap=Grayscale colormapAutomatic=false +colormapLogarithmic=false colormapMax=255.0 colormapMin=0.0 flipHorizontally=false diff --git a/devices/prigo_chi.properties b/devices/prigo_chi.properties index 32aa29e..230c215 100644 --- a/devices/prigo_chi.properties +++ b/devices/prigo_chi.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=41.0 minValue=0.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=deg diff --git a/devices/prigo_omega.properties b/devices/prigo_omega.properties index 55b62eb..852c4e0 100644 --- a/devices/prigo_omega.properties +++ b/devices/prigo_omega.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=1000.0 minValue=-1000.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=deg diff --git a/devices/prigo_phi.properties b/devices/prigo_phi.properties index 754fdff..2df7280 100644 --- a/devices/prigo_phi.properties +++ b/devices/prigo_phi.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=0.0 minValue=0.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=deg diff --git a/devices/prigo_x.properties b/devices/prigo_x.properties index 24757e5..1abdc99 100644 --- a/devices/prigo_x.properties +++ b/devices/prigo_x.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=0.0 minValue=-30.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=mm diff --git a/devices/prigo_y.properties b/devices/prigo_y.properties index 92ea73a..68424b3 100644 --- a/devices/prigo_y.properties +++ b/devices/prigo_y.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=2.0 minValue=-2.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=mm diff --git a/devices/prigo_z.properties b/devices/prigo_z.properties index 92ea73a..68424b3 100644 --- a/devices/prigo_z.properties +++ b/devices/prigo_z.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:18 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 maxValue=2.0 minValue=-2.0 offset=0.0 @@ -6,4 +6,5 @@ precision=3 resolution=NaN rotation=false scale=1.0 +sign_bit=0 unit=mm diff --git a/devices/slit1h_center.properties b/devices/slit1h_center.properties index 956bf03..fb4994c 100644 --- a/devices/slit1h_center.properties +++ b/devices/slit1h_center.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0020000000949949026 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit1h_size.properties b/devices/slit1h_size.properties index efa068b..e7ae3be 100644 --- a/devices/slit1h_size.properties +++ b/devices/slit1h_size.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0020000000949949026 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit1v_center.properties b/devices/slit1v_center.properties index fed8265..8762506 100644 --- a/devices/slit1v_center.properties +++ b/devices/slit1v_center.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1042 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=1.042E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit1v_size.properties b/devices/slit1v_size.properties index e3b8b22..de1ed73 100644 --- a/devices/slit1v_size.properties +++ b/devices/slit1v_size.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1022 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=1.022E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit2h_center.properties b/devices/slit2h_center.properties index 89a3e58..a535257 100644 --- a/devices/slit2h_center.properties +++ b/devices/slit2h_center.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1042 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit2h_size.properties b/devices/slit2h_size.properties index c45b83d..b52951a 100644 --- a/devices/slit2h_size.properties +++ b/devices/slit2h_size.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1022 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=1.022E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit2v_center.properties b/devices/slit2v_center.properties index 701898a..00217e5 100644 --- a/devices/slit2v_center.properties +++ b/devices/slit2v_center.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1042 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=1.042E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slit2v_size.properties b/devices/slit2v_size.properties index e3b8b22..de1ed73 100644 --- a/devices/slit2v_size.properties +++ b/devices/slit2v_size.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.1022 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=8 resolution=1.022E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slithop neg blade.properties b/devices/slithop neg blade.properties index efa068b..e7ae3be 100644 --- a/devices/slithop neg blade.properties +++ b/devices/slithop neg blade.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0020000000949949026 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/slithop pos blade.properties b/devices/slithop pos blade.properties index efa068b..e7ae3be 100644 --- a/devices/slithop pos blade.properties +++ b/devices/slithop pos blade.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0020000000949949026 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/th1.properties b/devices/th1.properties index b587654..3d2f95e 100644 --- a/devices/th1.properties +++ b/devices/th1.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.05000000074505806 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/th2.properties b/devices/th2.properties index a79fe86..6351a0b 100644 --- a/devices/th2.properties +++ b/devices/th2.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.05000000074505806 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/transmission.properties b/devices/transmission.properties index fa4c9a9..86eca44 100644 --- a/devices/transmission.properties +++ b/devices/transmission.properties @@ -1,8 +1,9 @@ -#Fri Nov 20 16:37:06 CET 2015 +#Wed Mar 06 11:25:01 CET 2019 maxValue=1.0 minValue=0.0 offset=0.0 precision=5 resolution=NaN scale=1.0 +sign_bit=0 unit= diff --git a/devices/try3.properties b/devices/try3.properties index da0c2b2..99c5cd4 100644 --- a/devices/try3.properties +++ b/devices/try3.properties @@ -1,4 +1,4 @@ -#Wed Mar 06 11:22:19 CET 2019 +#Wed Mar 06 11:25:01 CET 2019 defaultSpeed=0.05999999865889549 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=6 resolution=2.9999999242136255E-5 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm