From c05f807efb6ead4d7a71fe13356d326c99711159 Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-02.psi.ch>
Date: Mon, 14 Dec 2020 10:51:33 +0100
Subject: [PATCH] Sprint Dez 2020

---
 config/ROIs/BFO_4nm.roi        | Bin 0 -> 266 bytes
 config/mail.properties         |   4 ++--
 config/settings.properties     |  18 +++++++++---------
 config/variables.properties    |   8 ++++----
 script/test/demo_microscope.py |  13 +++++++++++++
 5 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 config/ROIs/BFO_4nm.roi
 create mode 100644 script/test/demo_microscope.py

diff --git a/config/ROIs/BFO_4nm.roi b/config/ROIs/BFO_4nm.roi
new file mode 100644
index 0000000000000000000000000000000000000000..0d02569816c9e6e5657fe43ac29cefcf6a8a19d3
GIT binary patch
literal 266
zcmZ4UmVvdjh(S2oCo8cmQ7<PkFI~?+DJwO(#CpQHi1`A=nmJ4i3>5_o3=E7wbt2JN
z6iV#>9sDHw_9>V`rqV)&I-mvy2G$Y=mLPvm!{Q<aL4^69c_pdosYODM7A*PR*lxkZ
z!05@qT9%konp#oBAb?QkSDKrYTGX~?sx0@E2i-8!gNi|>vjI(agR>mqtV!s08^NR)
P;ffe7VPXs}aMoM^a1Tha

literal 0
HcmV?d00001

diff --git a/config/mail.properties b/config/mail.properties
index ae109e2..29e6ad6 100644
--- a/config/mail.properties
+++ b/config/mail.properties
@@ -1,9 +1,9 @@
-#Wed Dec 02 17:22:08 CET 2020
+#Fri Dec 11 14:27:37 CET 2020
 auth=None
 port=0
 usr=
 smsSuffix=@sms.switch.ch
 host=smtpint.psi.ch
 from=pshell.sim@psi.ch
-to=
+to=alan.farhan@aalto.fi
 pwd=
diff --git a/config/settings.properties b/config/settings.properties
index 9e5d041..c3bfb26 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,25 +1,25 @@
-#Thu Dec 10 10:39:59 CET 2020
+#Sat Dec 12 00:56:20 CET 2020
 HARMONIC_ID_1=1
-RSYNC_USER=
+RSYNC_USER=e18413
 OUTLIERS_THRESHOLD=1000000000
 NORM_FILE=/sls/X11MA/data/X11MA/Data1/public/PEEM/2020_09/i1904_1_0.tif
 AUTO_SWITCH_VALVE=true
-DRY_RUN=true
-POL_ID_2=Lin_Ver
+DRY_RUN=false
+POL_ID_2=Circ_Minus
 OFFSET_ID_1=-1.5
-ID=ID2
+ID=ID1_ID2
 OFFSET_ID_2=-1.3
 proposal=proposal
-ENERGY=709.1
+ENERGY=707.3
 proposer=proposer
-POL_ID_1=Lin_Hor
+POL_ID_1=Circ_Plus
 RSYNC_HOST=
 sample=sample
-RSYNC_PATH=
+RSYNC_PATH=Kagome_Triangular_b100
 pgroup=pgroup
 ALPHA_ID_2=45.0
 ALPHA_ID_1=15.0
-RSYNC_DEL=false
+RSYNC_DEL=true
 HARMONIC_ID_2=1
 FdaBrowser=true
 authors=author1|author2
diff --git a/config/variables.properties b/config/variables.properties
index 8579aed..cd565a2 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Thu Dec 10 11:40:14 CET 2020
-LastRunDate=201210
-FileSequentialNumber=4808
-DaySequentialNumber=5
+#Sat Dec 12 22:25:59 CET 2020
+LastRunDate=201212
+FileSequentialNumber=4863
+DaySequentialNumber=74
diff --git a/script/test/demo_microscope.py b/script/test/demo_microscope.py
new file mode 100644
index 0000000..2287b1c
--- /dev/null
+++ b/script/test/demo_microscope.py
@@ -0,0 +1,13 @@
+print microscope.get_value("Objective")
+microscope.set_value("Objective",1478.178)
+
+
+
+objective = microscope.get_child("Objective")
+add_device(objective, True)
+objective.polling=500
+
+#lscan(objective, [Keithley_1_raw], 1475.168, 1478.168, 10, latency=1.0)
+
+#Contuous
+lscan(objective, [eiger.getDataMatrix()], 1475.168, 1478.168, 10, latency=1.0)
\ No newline at end of file