From 3d88fb2b459336add38999d5bb4523a239c38d20 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 16 Mar 2023 17:29:28 +0100 Subject: [PATCH] Closedown --- config/config.properties | 4 +- config/settings.properties | 12 +++--- config/variables.properties | 8 ++-- .../MultiRegionScan_HighStatCL_v20230206.py | 35 ++++++++---------- script/users/TUM/PVV_PBiAu_2302.xps | Bin 2896 -> 0 bytes 5 files changed, 28 insertions(+), 31 deletions(-) delete mode 100644 script/users/TUM/PVV_PBiAu_2302.xps diff --git a/config/config.properties b/config/config.properties index 229783f5..c8cbee0b 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Feb 15 16:10:44 CET 2023 +#Wed Mar 01 08:44:01 CET 2023 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -27,7 +27,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/allegretti/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index 60a8dc08..4eaf5370 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Thu Feb 16 16:24:54 CET 2023 -pgroup=p20770 -proposal=20221964 -proposer=allegretti +#Wed Mar 01 08:44:01 CET 2023 +pgroup=p19371 +proposal=GeTe +proposer=heinrich_m prefix= -sample= -authors= +sample=VA2458-GeMnTe_BaF(111) +authors=Martin Heinrich diff --git a/config/variables.properties b/config/variables.properties index 20600a10..1c2f4e6a 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Feb 16 18:02:34 CET 2023 -LastRunDate=230216 -FileSequentialNumber=15573 -DaySequentialNumber=9 +#Thu Mar 02 19:57:05 CET 2023 +LastRunDate=230302 +FileSequentialNumber=16018 +DaySequentialNumber=12 diff --git a/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py b/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py index aae29d48..252459f3 100644 --- a/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py +++ b/script/users/Niels/MultiRegionScan_HighStatCL_v20230206.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 30 +NUMBER_OF_CYCLES = 20 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -48,35 +48,32 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': -1.10,'Y': 0.0, 'Z': 117.0, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +REFERENCE_POSITION = {'X': -1.10,'Y': 0.60, 'Z': 116.50, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} SAMPLE_POSITION = {'X': -1.45,'Y': 0.0, 'Z': 114.0, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} # DEFINE THE REGIONS # -- Region A @ 578 eV -REGION_A1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_A2 = {'name': 'AuEF', 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_A3 = {'name': 'VB', 'elo': 570., 'ehi':575., 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A4 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A5 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_A6 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A2 = {'name': 'AuEF', 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_A3 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A4 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_A5 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # -- Region B @ 1050 eV -REGION_B1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_B2 = {'name': 'AuEF', 'elo': 1044., 'ehi':1047, 'estep':0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_B3 = {'name': 'VB', 'elo': 1042., 'ehi':1047, 'estep':0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B4 = {'name': 'In4d', 'elo': 1023., 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B5 = {'name': 'As3d', 'elo': 1001., 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B6 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B2 = {'name': 'AuEF', 'elo': 1044., 'ehi':1047, 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION_B3 = {'name': 'In4d', 'elo': 1023., 'ehi':1031., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'As3d', 'elo': 1001., 'ehi':1007., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B5 = {'name': 'In3d', 'elo': 590., 'ehi':605., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} # CHOOSE THE REGIONS TO RUN # -- 01 -- @578eV Au reference measurements (run 10 cyles) #REGIONS = [REGION_A1,REGION_A2] -# -- 02 -- @578eV High-Stat XPS of relevant core-levels (run 30 cyles) -#REGIONS = [REGION_A1,REGION_A4,REGION_A5,REGION_A6] - +# -- 02 -- @578eV High-Stat XPS of relevant core-levels (run 20 cyles) +#REGIONS = [REGION_A1,REGION_A3,REGION_A4,REGION_A5] # -- 03 -- @1050eV Au reference measurements (run 10 cyles) #REGIONS = [REGION_B1,REGION_B2] -# -- 04 -- @1050eV High-Stat XPS of relevant core-levels (run 30 cyles) -REGIONS = [REGION_B1,REGION_B4,REGION_B5,REGION_B6] +# -- 04 -- @1050eV High-Stat XPS of relevant core-levels (run 20 cyles) +REGIONS = [REGION_B1,REGION_B3,REGION_B4,REGION_B5] # close beam shutter and turn off analyser at the end of the scan diff --git a/script/users/TUM/PVV_PBiAu_2302.xps b/script/users/TUM/PVV_PBiAu_2302.xps deleted file mode 100644 index 0bcc5a187ea8b94a8793cc3a1dceca2250f7b3d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2896 zcmZ|Pc~leE9>DQQAczK81EOLcDk!4Tx*&oDeuIdjR!#L$D1v|nM35yzc*If&5COsZ z+)%OfiD-MYQH~+X($vS?DRwA31X~pZVT9H*<34 z8Nm_?2%FH=+agmV-Qpt?V%*k7ZR2lFS+ch=_?RU%E1pRZX-Nb@80j1*bQEZR>FxUV zxV!c5ps6sK$k5$D5Mw9-VL2T3PZUPQ^TqPIm9ygB8Z!xoKfy|kj2H6L{=(J>w@2{> zxo3)|un%er=_*ir=^&*qvmhm6#K>1m4+z6G-0AoIB883%qenc8VeX_C^mWw9hIQ#Ljn#jQqrYeC$T)M7=C0BbkQ#p2)Y;O4-oWR*Bv)N&=;*gK=23M z2f=G}Z_)Lm8#FkIW&}_SgQJWLjxshl$^@OMp+}8H$3|y{&K#X3IxBQG=s4)?(AlG# zh;A}E2XtI?j_9VMn~u&2-3)Xt=w_jtjcyJ)H*_DOn}?2O3xHaPZV|f0=seLa!QMyc ze9!?p65UdC{^$bGtw0xuZWX%K=+>ZHhmMDCJ-Q9(g3tw{3qco(ZX>#IbP?zx(QQVz z1s%==PyIfbJl=L+Fm6)3f5EKz)U-1l@nom7+V2?gYA%=)OgF3f*aRQgmm~ zm7_a{PKHj7?mW6mbk*o;(EWh!M|28wwX~!EKtIr(=71_}Mo~a#6R76e{yXGqC#XXF zwx7+GfNEk*L}C9lP`4_x*E zO_{Jb?3g{YI8~)3Ui<}GuB$}z{FlM)uoA}xUK!kx|4MBy=!Sc?8|T}yu0!jI)AmkV z%;7;0b6P|00BB$59(0mChqgUouFD4|LHo^}4$B@cf)3Ro_b3M`Jmp7Z28+4Sb?OUw z+h7d5N?+MG1%gQiFI=);@qlD|_Z+eoYe}0Mze~E5zmax1-iLiXL?kEVW{}v{oV1!E zda`wB1!V}=a0AKvFWXC8)D=fLs_nQ!2Z=(%~xX9{RZk1Wn)+JL$xyT~H<9H{R7;gznK z0L?eb%r%NmX!duXMOK?Y^Zajw_IIyBvvX6iaefmtA9oSnKb@d^PpVi~+5(-@;Yov|xNJ#gSUeZBW zFT1^|h2+ZN^&O8Fec_j( zXKwj!xAZu8;&p26OsOsWsx(c1cKLg_FZukIMcFuL*)e&SUF=C{4m-Olb4LL*B^T{@ zAgP4LOXD|B*R8*S?Y{OqkJa##L#AuT!cXBED;EkQlHh8nY#?vL&rqlFy_VhO0hgzX z|5dWI4r;m6TLTy*T;kM-Ic8tL#Y8h#e#k2L;U(|c6X_=S{-684t4~OSnxy)A$NGM# zULUb$!lQnu^6_?G!489}8U16!96O=X;?Cn4P7JtEVd^Cg$%YGFc_P1u18_c?Dm`D@ z0p}$t(^7hRK`!_uwX>%dsv0tq%AjJN@`}T; zpFwuAndf!R6)Kpw&g6&7LFVb0U0BHgS$X&;9(O%KHna1Aa)B|N>s5Ybxu5%g6m?4#