diff --git a/config/config.properties b/config/config.properties index ad7fa3c1..a9c84722 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Mon Jan 25 00:49:13 CET 2021 +#Wed Jan 27 00:49:28 CET 2021 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -20,7 +20,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/Niels/S2/Ox00-{date}-{time}-{name} +dataPath={data}/{year}/{month}/Auwearter/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 2a9a860a..6e2e998e 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Sat Jan 23 12:24:58 CET 2021 -pgroup=p17274 -proposal= -proposer=bl-dev +#Wed Jan 27 00:49:28 CET 2021 +pgroup= +proposal=20191320 +proposer=Auwearter prefix= -sample=Cu(111) -authors=Matthias Muntwiler +sample= +authors= diff --git a/config/variables.properties b/config/variables.properties index df9c38fa..295e6995 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Sat Jan 23 12:50:28 CET 2021 -FileSequentialNumber=6116 +#Wed Jan 27 06:58:45 CET 2021 +FileSequentialNumber=6520 diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py index 453f718f..4259b968 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -23,7 +23,7 @@ try: before_readout() time.sleep(0.2) time2 = time.time() - scienta_time = (time2 - time1) * 2 + scienta_time = (time2 - time1) + 1. print "step time: ", scienta_time if isinstance(STEPS,int):