diff --git a/config/config.properties b/config/config.properties index 9f1eff56..29fa5b3d 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Nov 22 12:06:11 CET 2022 +#Wed Nov 23 14:46:53 CET 2022 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -27,7 +27,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/soudna_z/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 94eb6c3a..454c1608 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Tue Nov 22 12:16:29 CET 2022 -pgroup=p17274 -proposal= -proposer=bl-dev +#Wed Nov 23 14:46:53 CET 2022 +pgroup=p19371 +proposal=GeTe +proposer=soudna_z prefix= -sample=dummy -authors=Matthias Muntwiler +sample=Cu(111) +authors=Zuzana Soudna diff --git a/config/variables.properties b/config/variables.properties index 480313cf..60ff7808 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Tue Nov 22 12:16:36 CET 2022 -LastRunDate=221122 -FileSequentialNumber=14750 -DaySequentialNumber=9 +#Wed Nov 23 16:30:41 CET 2022 +LastRunDate=221123 +FileSequentialNumber=14759 +DaySequentialNumber=8 diff --git a/script/local.py b/script/local.py index 207296bc..e1452f4c 100644 --- a/script/local.py +++ b/script/local.py @@ -112,13 +112,9 @@ def trig_scienta(): time.sleep(0.1) else: image_id = Scienta.currentImageCount - print("Scienta.start, image_id = ", image_id) Scienta.start() - print("Scienta.waitReady") Scienta.waitReady(-1) - print("Scienta.waitNewImage") Scienta.waitNewImage(3000, image_id) - print("exit trig_scienta, image_id = ", image_id) from keithley import KeiSample, KeiReference