From 37fd09cfd840fdcb12580e76a2e4bff0a7f79d34 Mon Sep 17 00:00:00 2001 From: gac-x09la Date: Wed, 9 Mar 2022 10:53:00 +0100 Subject: [PATCH] --- config/devices.properties | 2 +- config/variables.properties | 8 ++++---- extensions/Scienta.jar | Bin 69619 -> 69750 bytes script/scans/test/test.json | 28 +++++++++++++++++++++------- script/templates/SIStem.py | 3 +-- script/test/TestLensMode.py | 24 ++++++++++++++++++++++++ 6 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 script/test/TestLensMode.py diff --git a/config/devices.properties b/config/devices.properties index c1ab6a9..b297c0b 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,4 +1,4 @@ -scienta=Scienta|X09LA-SCIENTA false|||true +scienta=Scienta|X09LA-SCIENTA true|||true current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 6|Read||true keithley10=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI10:READOUT|Read||true keithley11=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI11:READOUT|Read||true diff --git a/config/variables.properties b/config/variables.properties index 83a3e3d..43bf783 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Jan 27 11:28:54 CET 2022 -LastRunDate=220127 -DaySequentialNumber=1 -FileSequentialNumber=180 +#Wed Mar 02 15:34:58 CET 2022 +LastRunDate=220302 +DaySequentialNumber=6 +FileSequentialNumber=187 diff --git a/extensions/Scienta.jar b/extensions/Scienta.jar index c92db1888ff0547480496e69a8ee4991fa5cefcc..7cf33ecc30cdfb68b830ecb30c95caf9a0656dbf 100644 GIT binary patch delta 9860 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 ml!pTFPhx#=uw&`W4bhmP`|cD?zjpUl